 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_cout.c,v 1.37 2015/09/20 16:57:13 kamil Exp $	*/
+/*	$NetBSD: rpc_cout.c,v 1.38 2016/01/23 02:33:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user or with the express written consent of
  * Sun Microsystems, Inc.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -28,27 +28,27 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_cout.c,v 1.37 2015/09/20 16:57:13 kamil Exp $");
+__RCSID("$NetBSD: rpc_cout.c,v 1.38 2016/01/23 02:33:09 dholland Exp $");
 #endif
 #endif
 /*
  * rpc_cout.c, XDR routine outputter for the RPC protocol compiler
  */
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 @@ -193,29 +193,29 @@ print_ifopen(int indent, const char *nam
 	f_print(fout, "if (!xdr_%s(xdrs", name);
+}
 static void
 print_ifarg(const char *arg)
+{
 	f_print(fout, ", %s", arg);
+}
 static void
 print_ifsizeof(const char *prefix, const char *type)
+{
 	if (streq(type, "bool")) {
-		f_print(fout, ", (u_int)sizeof(bool_t), (xdrproc_t)xdr_bool");
+		f_print(fout, ", (unsigned int)sizeof(bool_t), (xdrproc_t)xdr_bool");
 	} else {
-		f_print(fout, ", (u_int)sizeof(");
+		f_print(fout, ", (unsigned int)sizeof(");
 		if (undefined(type) && prefix) {
 			f_print(fout, "%s ", prefix);
+		}
 		f_print(fout, "%s), (xdrproc_t)xdr_%s", type, type);
+	}
+}
 static void
 print_ifclose(int indent)
+{
 	f_print(fout, "))\n");
 	tabify(fout, indent);
 	f_print(fout, "\treturn (FALSE);\n");
 @@ -262,30 +262,30 @@ print_ifstat(int indent, const char *pre
 				alt = "bytes";
+			}
 		if (streq(type, "string")) {
 			print_ifopen(indent, alt);
 			print_ifarg(objname);
 		} else {
 			if (alt) {
 				print_ifopen(indent, alt);
 			} else {
 				print_ifopen(indent, "array");
+			}
 			print_ifarg("(char **)(void *)");
 			if (*objname == '&') {
-				f_print(fout, "%s.%s_val, (u_int *)%s.%s_len",
+				f_print(fout, "%s.%s_val, (unsigned int *)%s.%s_len",
 				    objname, name, objname, name);
 			} else {
-				f_print(fout, "&%s->%s_val, (u_int *)&%s->%s_len",
+				f_print(fout, "&%s->%s_val, (unsigned int *)&%s->%s_len",
 				    objname, name, objname, name);
+			}
+		}
 		print_ifarg(amax);
 		if (!alt) {
 			print_ifsizeof(prefix, type);
+		}
 		break;
 	case REL_ALIAS:
 		print_ifopen(indent, type);
 		print_ifarg(objname);
 		break;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_hout.c,v 1.24 2015/09/20 15:45:07 kamil Exp $	*/
+/*	$NetBSD: rpc_hout.c,v 1.25 2016/01/23 02:33:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user or with the express written consent of
  * Sun Microsystems, Inc.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -28,27 +28,27 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_hout.c,v 1.24 2015/09/20 15:45:07 kamil Exp $");
+__RCSID("$NetBSD: rpc_hout.c,v 1.25 2016/01/23 02:33:09 dholland Exp $");
 #endif
 #endif
 /*
  * rpc_hout.c, Header file outputter for the RPC protocol compiler
  */
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
 @@ -437,27 +437,27 @@ ptypedef(definition *def)
 			} else
 				if (streq(old, "bool")) {
 					old = "bool_t";
+				}
 		if (undefined2(old, name) && def->def.ty.old_prefix) {
 			s_print(prefix, "%s ", def->def.ty.old_prefix);
 		} else {
 			prefix[0] = 0;
+		}
 		f_print(fout, "typedef ");
 		switch (rel) {
 		case REL_ARRAY:
 			f_print(fout, "struct {\n");
-			f_print(fout, "\tu_int %s_len;\n", name);
+			f_print(fout, "\tunsigned int %s_len;\n", name);
 			f_print(fout, "\t%s%s *%s_val;\n", prefix, old, name);
 			f_print(fout, "} %s", name);
 			break;
 		case REL_POINTER:
 			f_print(fout, "%s%s *%s", prefix, old, name);
 			break;
 		case REL_VECTOR:
 			f_print(fout, "%s%s %s[%s]", prefix, old, name,
 			    def->def.ty.array_max);
 			break;
 		case REL_ALIAS:
 			f_print(fout, "%s%s %s", prefix, old, name);
 			break;
 @@ -501,27 +501,27 @@ pdeclaration(const char *name, declarati
 		case REL_ALIAS:
 			f_print(fout, "%s%s %s", prefix, type, dec->name);
 			break;
 		case REL_VECTOR:
 			f_print(fout, "%s%s %s[%s]", prefix, type, dec->name,
 			    dec->array_max);
 			break;
 		case REL_POINTER:
 			f_print(fout, "%s%s *%s", prefix, type, dec->name);
 			break;
 		case REL_ARRAY:
 			f_print(fout, "struct {\n");
 			tabify(fout, tab);
-			f_print(fout, "\tu_int %s_len;\n", dec->name);
+			f_print(fout, "\tunsigned int %s_len;\n", dec->name);
 			tabify(fout, tab);
 			f_print(fout, "\t%s%s *%s_val;\n", prefix, type, dec->name);
 			tabify(fout, tab);
 			f_print(fout, "} %s", dec->name);
 			break;
+		}
+	}
 	f_print(fout, "%s", separator);
+}
 static int
 undefined2(const char *type, const char *stop)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_parse.c,v 1.21 2015/05/09 23:29:51 dholland Exp $	*/
+/*	$NetBSD: rpc_parse.c,v 1.22 2016/01/23 02:33:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user or with the express written consent of
  * Sun Microsystems, Inc.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -28,27 +28,27 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_parse.c,v 1.21 2015/05/09 23:29:51 dholland Exp $");
+__RCSID("$NetBSD: rpc_parse.c,v 1.22 2016/01/23 02:33:09 dholland Exp $");
 #endif
 #endif
 /*
  * rpc_parse.c, Parser for the RPC protocol compiler
  * Copyright (C) 1987 Sun Microsystems, Inc.
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "rpc/types.h"
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 @@ -430,27 +430,27 @@ get_declaration(declaration *dec, defkin
 			error("No array-of-pointer declarations -- use typedef");
+		}
 		dec->rel = REL_VECTOR;
 		scan_num(&tok);
 		dec->array_max = tok.str;
 		scan(TOK_RBRACKET, &tok);
 	} else
 		if (peekscan(TOK_LANGLE, &tok)) {
 			if (dec->rel == REL_POINTER) {
 				error("No array-of-pointer declarations -- use typedef");
+			}
 			dec->rel = REL_ARRAY;
 			if (peekscan(TOK_RANGLE, &tok)) {
-				dec->array_max = "(u_int)~0";
+				dec->array_max = "(unsigned int)~0";
 				/* unspecified size, use * max */
 			} else {
 				scan_num(&tok);
 				dec->array_max = tok.str;
 				scan(TOK_RANGLE, &tok);
+			}
+		}
 	if (streq(dec->type, "opaque")) {
 		if (dec->rel != REL_ARRAY && dec->rel != REL_VECTOR) {
 			error("Array declaration expected");
+		}
 	} else
 		if (streq(dec->type, "string")) {
 @@ -496,40 +496,40 @@ get_prog_declaration(declaration *dec, d
 		if (streq(dec->type, "string")) {
 			error("Pointer to string not allowed in program arguments\n");
+		}
 		dec->rel = REL_POINTER;
 		if (peekscan(TOK_IDENT, &tok))	/* optional name of argument */
 			dec->name = strdup(tok.str);
+	}
 	if (peekscan(TOK_LANGLE, &tok)) {
 		if (!streq(dec->type, "string")) {
 			error("Arrays cannot be declared as arguments to procedures -- use typedef");
+		}
 		dec->rel = REL_ARRAY;
 		if (peekscan(TOK_RANGLE, &tok)) {
-			dec->array_max = "(u_int)~0";
+			dec->array_max = "(unsigned int)~0";
 			/* unspecified size, use max */
 		} else {
 			scan_num(&tok);
 			dec->array_max = tok.str;
 			scan(TOK_RANGLE, &tok);
+		}
+	}
 	if (streq(dec->type, "string")) {
 		if (dec->rel != REL_ARRAY) {	/* .x specifies just string as
 						 * type of argument - make it
 						 * string<> */
 			dec->rel = REL_ARRAY;
-			dec->array_max = "(u_int)~0";
+			dec->array_max = "(unsigned int)~0";
 			/* unspecified size, use max */
+		}
+	}
+}
 static void
 get_type(const char **prefixp, const char **typep, defkind dkind)
+{
 	token   tok;
 	*prefixp = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_tblout.c,v 1.14 2013/12/15 00:40:17 christos Exp $	*/
+/*	$NetBSD: rpc_tblout.c,v 1.15 2016/01/23 02:33:09 dholland Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
  * media and as a part of the software program in whole or part.  Users
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user or with the express written consent of
  * Sun Microsystems, Inc.
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
 @@ -28,27 +28,27 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #else
-__RCSID("$NetBSD: rpc_tblout.c,v 1.14 2013/12/15 00:40:17 christos Exp $");
+__RCSID("$NetBSD: rpc_tblout.c,v 1.15 2016/01/23 02:33:09 dholland Exp $");
 #endif
 #endif
 /*
  * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
  */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
 @@ -56,27 +56,27 @@ __RCSID("$NetBSD: rpc_tblout.c,v 1.14 20
 #define TABCOUNT	5
 #define TABSTOP		(TABSIZE*TABCOUNT)
 static char tabstr[TABCOUNT + 1] = "\t\t\t\t\t";
 static const char tbl_hdr[] = "struct rpcgen_table %s_table[] = {\n";
 static const char tbl_end[] = "};\n";
 static const char null_entry[] = "\t(char *(*)())0,\n\
  \t(xdrproc_t)xdr_void,\t\t0,\n\
  \t(xdrproc_t)xdr_void,\t\t0,\n";
 static const char tbl_nproc[] =
-    "u_int %s_nproc =\n\t(u_int)(sizeof(%s_table)/sizeof(%s_table[0]));\n\n";
+    "unsigned int %s_nproc =\n\t(unsigned int)(sizeof(%s_table)/sizeof(%s_table[0]));\n\n";
 static void write_table(definition *);
 static void printit(const char *, const char *);
 void
 write_tables(void)
+{
 	list   *l;
 	definition *def;
 	f_print(fout, "\n");
 	for (l = defined; l != NULL; l = l->next) {
 		def = (definition *) l->val;
 @@ -162,20 +162,20 @@ printit(const char *prefix, const char *
 	int     tabs;
 	len = fprintf(fout, "\txdr_%s,", stringfix(type));
 	/* account for leading tab expansion */
 	len += TABSIZE - 1;
 	/* round up to tabs required */
 	tabs = (TABSTOP - len + TABSIZE - 1) / TABSIZE;
 	f_print(fout, "%s", &tabstr[TABCOUNT - tabs]);
 	if (streq(type, "void")) {
 		f_print(fout, "0");
 	} else {
-		f_print(fout, "(u_int)sizeof(");
+		f_print(fout, "(unsigned int)sizeof(");
 		/* XXX: should "follow" be 1 ??? */
 		ptype(prefix, type, 0);
 		f_print(fout, ")");
+	}
 	f_print(fout, ",\n");
+}