 @@ -1,725 +1,725 @@
-/*	$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.
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
+ *
  * Sun Microsystems, Inc.
  * 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"
 #include "rpc_util.h"
 static int findtype(definition *, const char *);
 static int undefined(const char *);
 static void print_generic_header(const char *, int);
 static void print_header(definition *);
 static void print_prog_header(proc_list *);
 static void print_trailer(void);
 static void print_ifopen(int, const char *);
 static void print_ifarg(const char *);
 static void print_ifsizeof(const char *, const char *);
 static void print_ifclose(int);
 static void print_ifstat(int, const char *, const char *, relation,
     const char *, const char *, const char *);
 static void emit_enum(definition *);
 static void emit_program(definition *);
 static void emit_union(definition *);
 static void emit_struct(definition *);
 static void emit_typedef(definition *);
 static void print_stat(int, declaration *);
 /*
  * Emit the C-routine for the given definition
  */
 void
 emit(definition *def)
+{
 	if (def->def_kind == DEF_CONST) {
 		return;
+	}
 	if (def->def_kind == DEF_PROGRAM) {
 		emit_program(def);
 		return;
+	}
 	if (def->def_kind == DEF_TYPEDEF) {
 		/* now we need to handle declarations like struct typedef foo
 		 * foo; since we dont want this to be expanded into 2 calls to
 		 * xdr_foo */
 		if (strcmp(def->def.ty.old_type, def->def_name) == 0)
 			return;
 	};
 	print_header(def);
 	switch (def->def_kind) {
 	case DEF_UNION:
 		emit_union(def);
 		break;
 	case DEF_ENUM:
 		emit_enum(def);
 		break;
 	case DEF_STRUCT:
 		emit_struct(def);
 		break;
 	case DEF_TYPEDEF:
 		emit_typedef(def);
 		break;
 	case DEF_PROGRAM:
 	case DEF_CONST:
 		errx(1, "Internal error at %s:%d: Case %d not handled",
 		    __FILE__, __LINE__, def->def_kind);
 		break;
+	}
 	print_trailer();
+}
 static int
 findtype(definition *def, const char *type)
+{
 	if (def->def_kind == DEF_PROGRAM || def->def_kind == DEF_CONST) {
 		return (0);
 	} else {
 		return (streq(def->def_name, type));
+	}
+}
 static int
 undefined(const char *type)
+{
 	definition *def;
 	def = (definition *) FINDVAL(defined, type, findtype);
 	return (def == NULL);
+}
 static void
 print_generic_header(const char *procname, int pointerp)
+{
 	f_print(fout, "\n");
 	f_print(fout, "bool_t\n");
 	f_print(fout, "xdr_%s(", procname);
 	f_print(fout, "XDR *xdrs, ");
 	f_print(fout, "%s ", procname);
 	if (pointerp)
 		f_print(fout, "*");
 	f_print(fout, "objp)\n{\n");
+}
 static void
 print_header(definition *def)
+{
 	print_generic_header(def->def_name,
 	    def->def_kind != DEF_TYPEDEF ||
 	    !isvectordef(def->def.ty.old_type, def->def.ty.rel));
+}
 static void
 print_prog_header(proc_list *plist)
+{
 	print_generic_header(plist->args.argname, 1);
+}
 static void
 print_trailer(void)
+{
 	f_print(fout, "\treturn (TRUE);\n");
 	f_print(fout, "}\n");
+}
 static void
 print_ifopen(int indent, const char *name)
+{
 	char _t_kludge[32];
 	/*
 	 * XXX Solaris seems to strip the _t. No idea why.
 	 */
 	if (!strcmp(name, "rpcprog_t") || !strcmp(name, "rpcvers_t") ||
 	    !strcmp(name, "rpcproc_t") || !strcmp(name, "rpcprot_t") ||
 	    !strcmp(name, "rpcport_t") || !strcmp(name, "rpcpinline_t")) {
 		strncpy(_t_kludge, name, strlen(name) - 2);
 		name = _t_kludge;
+	}
 	tabify(fout, indent);
 	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");
+}
 static void
 print_ifstat(int indent, const char *prefix, const char *type, relation rel,
 	     const char *amax, const char *objname, const char *name)
+{
 	const char *alt = NULL;
 	switch (rel) {
 	case REL_POINTER:
 		print_ifopen(indent, "pointer");
 		print_ifarg("(char **)(void *)");
 		f_print(fout, "%s", objname);
 		print_ifsizeof(prefix, type);
 		break;
 	case REL_VECTOR:
 		if (streq(type, "string")) {
 			alt = "string";
 		} else
 			if (streq(type, "opaque")) {
 				alt = "opaque";
+			}
 		if (alt) {
 			print_ifopen(indent, alt);
 			print_ifarg(objname);
 		} else {
 			print_ifopen(indent, "vector");
 			print_ifarg("(char *)(void *)");
 			f_print(fout, "%s", objname);
+		}
 		print_ifarg(amax);
 		if (!alt) {
 			print_ifsizeof(prefix, type);
+		}
 		break;
 	case REL_ARRAY:
 		if (streq(type, "string")) {
 			alt = "string";
 		} else
 			if (streq(type, "opaque")) {
 				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;
+	}
 	print_ifclose(indent);
+}
 /* ARGSUSED */
 static void
 emit_enum(definition *def)
+{
 	tabify(fout, 1);
 	f_print(fout, "{\n");
 	tabify(fout, 2);
 	f_print(fout, "enum_t et = (enum_t)*objp;\n");
 	print_ifopen(2, "enum");
 	print_ifarg("&et");
 	print_ifclose(2);
 	tabify(fout, 2);
 	f_print(fout, "*objp = (%s)et;\n", def->def_name);
 	tabify(fout, 1);
 	f_print(fout, "}\n");
+}
 static void
 emit_program(definition *def)
+{
 	decl_list *dl;
 	version_list *vlist;
 	proc_list *plist;
 	for (vlist = def->def.pr.versions; vlist != NULL; vlist = vlist->next)
 		for (plist = vlist->procs; plist != NULL; plist = plist->next) {
 			if (!newstyle || plist->arg_num < 2)
 				continue;	/* old style, or single
 						 * argument */
 			print_prog_header(plist);
 			for (dl = plist->args.decls; dl != NULL;
 			    dl = dl->next)
 				print_stat(1, &dl->decl);
 			print_trailer();
+		}
+}
 static void
 emit_union(definition *def)
+{
 	declaration *dflt;
 	case_list *cl;
 	declaration *cs;
 	char   *object;
 	static const char vecformat[] = "objp->%s_u.%s";
 	static const char format[] = "&objp->%s_u.%s";
 	f_print(fout, "\n");
 	print_stat(1, &def->def.un.enum_decl);
 	f_print(fout, "\tswitch (objp->%s) {\n", def->def.un.enum_decl.name);
 	for (cl = def->def.un.cases; cl != NULL; cl = cl->next) {
 		f_print(fout, "\tcase %s:\n", cl->case_name);
 		if (cl->contflag == 1)	/* a continued case statement */
 			continue;
 		cs = &cl->case_decl;
 		if (!streq(cs->type, "void")) {
 			object = alloc(strlen(def->def_name) + strlen(format) +
 			    strlen(cs->name) + 1);
 			if (isvectordef(cs->type, cs->rel)) {
 				s_print(object, vecformat, def->def_name,
 				    cs->name);
 			} else {
 				s_print(object, format, def->def_name,
 				    cs->name);
+			}
 			print_ifstat(2, cs->prefix, cs->type, cs->rel,
 			    cs->array_max, object, cs->name);
 			free(object);
+		}
 		f_print(fout, "\t\tbreak;\n");
+	}
 	dflt = def->def.un.default_decl;
 	f_print(fout, "\tdefault:\n");
 	if (dflt != NULL) {
 		if (!streq(dflt->type, "void")) {
 			object = alloc(strlen(def->def_name) + strlen(format) +
 			    strlen(dflt->name) + 1);
 			if (isvectordef(dflt->type, dflt->rel)) {
 				s_print(object, vecformat, def->def_name,
 				    dflt->name);
 			} else {
 				s_print(object, format, def->def_name,
 				    dflt->name);
+			}
 			print_ifstat(2, dflt->prefix, dflt->type, dflt->rel,
 			    dflt->array_max, object, dflt->name);
 			free(object);
+		}
 		f_print(fout, "\t\tbreak;\n");
 	} else {
 		f_print(fout, "\t\treturn (FALSE);\n");
+	}
 	f_print(fout, "\t}\n");
+}
 static void
 emit_struct(definition *def)
+{
 	decl_list *dl;
 	int     i, j, size, flag;
 	decl_list *cur = NULL, *psav;
 	bas_type *ptr;
 	char   *sizestr;
 	const char *plus;
 	char    ptemp[256];
 	int     can_inline;
 	if (doinline == 0) {
 		f_print(fout, "\n");
 		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
 			print_stat(1, &dl->decl);
 		return;
+	}
 	size = 0;
 	can_inline = 0;
 	for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
 		if ((dl->decl.prefix == NULL) &&
 		    ((ptr = find_type(dl->decl.type)) != NULL) &&
 		    ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) {
 			if (dl->decl.rel == REL_ALIAS)
 				size += ptr->length;
 			else {
 				can_inline = 1;
 				break;	/* can be inlined */
 			};
 		} else {
 			if (size >= doinline) {
 				can_inline = 1;
 				break;	/* can be inlined */
+			}
 			size = 0;
+		}
 	if (size > doinline)
 		can_inline = 1;
 	if (can_inline == 0) {	/* can not inline, drop back to old mode */
 		f_print(fout, "\n");
 		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
 			print_stat(1, &dl->decl);
 		return;
 	};
 	/* May cause lint to complain. but  ... */
 	f_print(fout, "\tint32_t *buf;\n");
 	flag = PUT;
 	f_print(fout, "\n\tif (xdrs->x_op == XDR_ENCODE) {\n");
 	for (j = 0; j < 2; j++) {
 		i = 0;
 		size = 0;
 		sizestr = NULL;
 		for (dl = def->def.st.decls; dl != NULL; dl = dl->next) {	/* xxx */
 			/* now walk down the list and check for basic types */
 			if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) {
 				if (i == 0)
 					cur = dl;
 				i++;
 				if (dl->decl.rel == REL_ALIAS)
 					size += ptr->length;
 				else {
 					/* this is required to handle arrays */
 					if (sizestr == NULL)
 						plus = "";
 					else
 						plus = " + ";
 					if (ptr->length != 1)
 						s_print(ptemp, "%s%s * %d", plus, dl->decl.array_max, ptr->length);
 					else
 						s_print(ptemp, "%s%s", plus, dl->decl.array_max);
 					/* now concatenate to sizestr !!!! */
 					if (sizestr == NULL)
 						sizestr = strdup(ptemp);
 					else {
 						char *nsizestr;
 						nsizestr = realloc(sizestr, strlen(sizestr) + strlen(ptemp) + 1);
 						if (nsizestr == NULL) {
 							err(EXIT_FAILURE, "realloc");
+						}
 						sizestr = nsizestr;
 						sizestr = strcat(sizestr, ptemp);	/* build up length of
 											 * array */
+					}
+				}
 			} else {
 				if (i > 0)  {
 					if (sizestr == NULL && size < doinline) {
 						/* don't expand into inline
 						 * code if size < doinline */
 						while (cur != dl) {
 							print_stat(2, &cur->decl);
 							cur = cur->next;
+						}
 					} else {
 						/* were already looking at a
 						 * xdr_inlineable structure */
 						if (sizestr == NULL)
 							f_print(fout, "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %d * BYTES_PER_XDR_UNIT);\n",
 							    size);
 						else
 							if (size == 0)
 								f_print(fout,
 								    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %s * BYTES_PER_XDR_UNIT);\n",
 								    sizestr);
 							else
 								f_print(fout,
 								    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, (%d + %s) * BYTES_PER_XDR_UNIT);\n",
 								    size, sizestr);
 						f_print(fout, "\t\tif (buf == NULL) {\n");
 						psav = cur;
 						while (cur != dl) {
 							print_stat(3, &cur->decl);
 							cur = cur->next;
+						}
 						f_print(fout, "\t\t} else {\n");
 						cur = psav;
 						while (cur != dl) {
 							emit_inline(&cur->decl, flag);
 							cur = cur->next;
+						}
 						f_print(fout, "\t\t}\n");
+					}
+				}
 				size = 0;
 				i = 0;
 				if (sizestr) {
 					free(sizestr);
 					sizestr = NULL;
+				}
 				print_stat(2, &dl->decl);
+			}
+		}
 		if (i > 0) {
 			if (sizestr == NULL && size < doinline) {
 				/* don't expand into inline code if size <
 				 * doinline */
 				while (cur != dl) {
 					print_stat(2, &cur->decl);
 					cur = cur->next;
+				}
 			} else {
 				/* were already looking at a xdr_inlineable
 				 * structure */
 				if (sizestr == NULL)
 					f_print(fout, "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %d * BYTES_PER_XDR_UNIT);\n",
 					    size);
 				else
 					if (size == 0)
 						f_print(fout,
 						    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %s * BYTES_PER_XDR_UNIT);\n",
 						    sizestr);
 					else
 						f_print(fout,
 						    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, (%d + %s) * BYTES_PER_XDR_UNIT);\n",
 						    size, sizestr);
 				f_print(fout, "\t\tif (buf == NULL) {\n");
 				psav = cur;
 				while (cur != NULL) {
 					print_stat(3, &cur->decl);
 					cur = cur->next;
+				}
 				f_print(fout, "\t\t} else {\n");
 				cur = psav;
 				while (cur != dl) {
 					emit_inline(&cur->decl, flag);
 					cur = cur->next;
+				}
 				f_print(fout, "\t\t}\n");
+			}
+		}
 		if (flag == PUT) {
 			flag = GET;
 			f_print(fout, "\t} else if (xdrs->x_op == XDR_DECODE) {\n");
+		}
+	}
 	f_print(fout, "\t} else {\n");
 	/* now take care of XDR_FREE case */
 	for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
 		print_stat(2, &dl->decl);
 	f_print(fout, "\t}\n");
+}
 static void
 emit_typedef(definition *def)
+{
 	const char *prefix = def->def.ty.old_prefix;
 	const char *type = def->def.ty.old_type;
 	const char *amax = def->def.ty.array_max;
 	relation rel = def->def.ty.rel;
 	f_print(fout, "\n");
 	print_ifstat(1, prefix, type, rel, amax, "objp", def->def_name);
+}
 static void
 print_stat(int indent, declaration *dec)
+{
 	const char *prefix = dec->prefix;
 	const char *type = dec->type;
 	const char *amax = dec->array_max;
 	relation rel = dec->rel;
 	char    name[256];
 	if (isvectordef(type, rel)) {
 		s_print(name, "objp->%s", dec->name);
 	} else {
 		s_print(name, "&objp->%s", dec->name);
+	}
 	print_ifstat(indent, prefix, type, rel, amax, name, dec->name);
+}
 void
 emit_inline(declaration *decl, int flag)
+{
 /*check whether an array or not */
 	switch (decl->rel) {
 	case REL_ALIAS:
 		emit_single_in_line(decl, flag, REL_ALIAS);
 		break;
 	case REL_VECTOR:
 		f_print(fout, "\t\t\t{\n");
 		f_print(fout, "\t\t\t\tint i;\n");
 		f_print(fout, "\t\t\t\t%s *genp;\n", decl->type);
 		f_print(fout, "\n");
 		f_print(fout, "\t\t\t\tfor (i = 0, genp = objp->%s;\n",
 		    decl->name);
 		f_print(fout, "\t\t\t\t    i < %s; i++) {\n\t\t",
 		    decl->array_max);
 		emit_single_in_line(decl, flag, REL_VECTOR);
 		f_print(fout, "\t\t\t\t}\n\t\t\t}\n");
 		break;
 	case REL_ARRAY:
 	case REL_POINTER:
 		errx(1, "Internal error at %s:%d: Case %d not handled",
 		    __FILE__, __LINE__, decl->rel);
+	}
+}
 void
 emit_single_in_line(declaration *decl, int flag, relation rel)
+{
 	const char *upp_case;
 	char *freeable;
 	int     freed = 0;
 	if (flag == PUT)
 		f_print(fout, "\t\t\tIXDR_PUT_");
 	else
 		if (rel == REL_ALIAS)
 			f_print(fout, "\t\t\tobjp->%s = IXDR_GET_", decl->name);
 		else
 			f_print(fout, "\t\t\t*genp++ = IXDR_GET_");
 	upp_case = freeable = upcase(decl->type);
 	/* hack  - XX */
 	if (strcmp(upp_case, "INT") == 0) {
 		free(freeable);
 		freed = 1;
 		upp_case = "INT32";
 	} else if (strcmp(upp_case, "U_INT") == 0) {
 		free(freeable);
 		freed = 1;
 		upp_case = "U_INT32";
+	}
 	if (flag == PUT) {
 		if (rel == REL_ALIAS)
 			f_print(fout, "%s(buf, objp->%s);\n", upp_case, decl->name);
 		else
 			f_print(fout, "%s(buf, *genp++);\n", upp_case);
 	} else
 		f_print(fout, "%s(buf);\n", upp_case);
 	if (!freed)
 		free(freeable);
+}
 char   *
 upcase(const char *str)
+{
 	char   *ptr, *hptr;
 	ptr = malloc(strlen(str) + 1);
 	if (ptr == NULL) {
 		errx(EXIT_FAILURE, "Out of memory");
+	}
 	hptr = ptr;
 	while (*str != '\0')
 		*ptr++ = toupper((unsigned char)*str++);
 	*ptr = '\0';
 	return (hptr);
+}

 @@ -1,543 +1,543 @@
-/*	$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.
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
+ *
  * Sun Microsystems, Inc.
  * 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"
 static void pconstdef(definition *);
 static void pargdef(definition *);
 static void pstructdef(definition *);
 static void puniondef(definition *);
 static void pdefine(const char *, const char *);
 static void puldefine(const char *, const char *);
 static int define_printed(proc_list *, version_list *);
 static void pprogramdef(definition *);
 static void penumdef(definition *);
 static void ptypedef(definition *);
 static int undefined2(const char *, const char *);
 static void cplusplusstart(void);
 static void cplusplusend(void);
 /*
  * Print the C-version of an xdr definition
  */
 void
 print_datadef(definition *def)
+{
 	if (def->def_kind == DEF_PROGRAM)	/* handle data only */
 		return;
 	if (def->def_kind != DEF_CONST) {
 		f_print(fout, "\n");
+	}
 	switch (def->def_kind) {
 	case DEF_STRUCT:
 		pstructdef(def);
 		break;
 	case DEF_UNION:
 		puniondef(def);
 		break;
 	case DEF_ENUM:
 		penumdef(def);
 		break;
 	case DEF_TYPEDEF:
 		ptypedef(def);
 		break;
 	case DEF_PROGRAM:
 		pprogramdef(def);
 		break;
 	case DEF_CONST:
 		pconstdef(def);
 		break;
+	}
+}
 void
 print_progdef(definition *def)
+{
 	switch (def->def_kind) {
 	case DEF_PROGRAM:
 		f_print(fout, "\n");
 		pprogramdef(def);
 		break;
 	case DEF_CONST:
 	case DEF_TYPEDEF:
 	case DEF_ENUM:
 	case DEF_UNION:
 	case DEF_STRUCT:
 		break;
+	}
+}
 void
 print_funcdef(definition *def, int *did)
+{
 	switch (def->def_kind) {
 	case DEF_PROGRAM:
 	case DEF_CONST:
 		break;
 	case DEF_TYPEDEF:
 	case DEF_ENUM:
 	case DEF_UNION:
 	case DEF_STRUCT:
 		if (!*did) {
 		    f_print(fout, "\n");
 		    cplusplusstart();
 		    *did = 1;
+		}
 		pxdrfuncdecl(def->def_name,
 		    def->def_kind != DEF_TYPEDEF ||
 		    !isvectordef(def->def.ty.old_type, def->def.ty.rel));
 		break;
+	}
+}
 void
 print_funcend(int did) {
 	if (did) {
 		cplusplusend();
+	}
+}
 void
 pxdrfuncdecl(const char *name, int pointerp)
+{
 	f_print(fout, "bool_t xdr_%s(XDR *, %s%s);\n", name,
 	    name, pointerp ? (" *") : "");
+}
 static void
 pconstdef(definition *def)
+{
 	pdefine(def->def_name, def->def.co);
+}
 /* print out the definitions for the arguments of functions in the
    header file
 */
 static void
 pargdef(definition *def)
+{
 	decl_list *l;
 	version_list *vers;
 	char   *name;
 	proc_list *plist;
 	int did;
 	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
 		for (plist = vers->procs; plist != NULL; plist = plist->next) {
 			if (!newstyle || plist->arg_num < 2) {
 				continue;	/* old style or single args */
+			}
 			name = plist->args.argname;
 			f_print(fout, "struct %s {\n", name);
 			for (l = plist->args.decls;
 			    l != NULL; l = l->next) {
 				pdeclaration(name, &l->decl, 1, ";\n");
+			}
 			f_print(fout, "};\n");
 			f_print(fout, "typedef struct %s %s;\n", name, name);
+		}
+	}
 	did = 0;
 	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
 		for (plist = vers->procs; plist != NULL; plist = plist->next) {
 			if (!newstyle || plist->arg_num < 2) {
 				continue;	/* old style or single args */
+			}
 			if (!did) {
 				cplusplusstart();
 				did = 1;
+			}
 			pxdrfuncdecl(plist->args.argname, 1);
+		}
+	}
 	if (did) {
 		cplusplusend();
+	}
+}
 static void
 pstructdef(definition *def)
+{
 	decl_list *l;
 	const char *name = def->def_name;
 	f_print(fout, "struct %s {\n", name);
 	for (l = def->def.st.decls; l != NULL; l = l->next) {
 		pdeclaration(name, &l->decl, 1, ";\n");
+	}
 	f_print(fout, "};\n");
 	f_print(fout, "typedef struct %s %s;\n", name, name);
+}
 static void
 puniondef(definition *def)
+{
 	case_list *l;
 	const char *name = def->def_name;
 	declaration *decl;
 	f_print(fout, "struct %s {\n", name);
 	decl = &def->def.un.enum_decl;
 	if (streq(decl->type, "bool")) {
 		f_print(fout, "\tbool_t %s;\n", decl->name);
 	} else {
 		f_print(fout, "\t%s %s;\n", decl->type, decl->name);
+	}
 	f_print(fout, "\tunion {\n");
 	for (l = def->def.un.cases; l != NULL; l = l->next) {
 		if (l->contflag == 0)
 			pdeclaration(name, &l->case_decl, 2, ";\n");
+	}
 	decl = def->def.un.default_decl;
 	if (decl && !streq(decl->type, "void")) {
 		pdeclaration(name, decl, 2, ";\n");
+	}
 	f_print(fout, "\t} %s_u;\n", name);
 	f_print(fout, "};\n");
 	f_print(fout, "typedef struct %s %s;\n", name, name);
+}
 static void
 pdefine(const char *name, const char *num)
+{
 	f_print(fout, "#define %s %s\n", name, num);
+}
 static void
 puldefine(const char *name, const char *num)
+{
 	f_print(fout, "#define %s %s\n", name, num);
+}
 static int
 define_printed(proc_list *stop, version_list *start)
+{
 	version_list *vers;
 	proc_list *proc;
 	for (vers = start; vers != NULL; vers = vers->next) {
 		for (proc = vers->procs; proc != NULL; proc = proc->next) {
 			if (proc == stop) {
 				return (0);
 			} else
 				if (streq(proc->proc_name, stop->proc_name)) {
 					return (1);
+				}
+		}
+	}
 	errx(1, "Internal error at %s:%d: procedure not found",
 	    __FILE__, __LINE__);
 	/* NOTREACHED */
+}
 static void
 cplusplusstart(void)
+{
 	if (BSDflag)
 		f_print(fout, "__BEGIN_DECLS\n");
 	else
 		f_print(fout, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
+}
 static void
 cplusplusend(void)
+{
 	if (BSDflag)
 		f_print(fout, "__END_DECLS\n");
 	else
 		f_print(fout, "#ifdef __cplusplus\n};\n#endif\n");
+}
 static void
 pprogramdef(definition *def)
+{
 	version_list *vers;
 	proc_list *proc;
 	pargdef(def);
 	puldefine(def->def_name, def->def.pr.prog_num);
 	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
 		if (tblflag) {
 			f_print(fout, "extern struct rpcgen_table %s_%s_table[];\n",
 			    locase(def->def_name), vers->vers_num);
 			f_print(fout, "extern %s_%s_nproc;\n",
 			    locase(def->def_name), vers->vers_num);
+		}
 		puldefine(vers->vers_name, vers->vers_num);
 		for (proc = vers->procs; proc != NULL; proc = proc->next) {
 			if (!define_printed(proc, def->def.pr.versions)) {
 				puldefine(proc->proc_name, proc->proc_num);
+			}
+		}
+	}
 	/*
 	 * Print out 3 definitions, one for ANSI-C, another for C++, a
 	 * third for old style C
 	 */
 	f_print(fout, "\n");
 	cplusplusstart();
 	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
 		for (proc = vers->procs; proc != NULL; proc = proc->next) {
 			pprocdef(proc, vers, "CLIENT *", 0);
 			pprocdef(proc, vers, "struct svc_req *", 1);
+		}
+	}
 	cplusplusend();
+}
 void
 pprocdef(proc_list *proc, version_list *vp, const char *addargtype,
      int server_p)
+{
 	decl_list *dl;
 	if (Mflag) {
 		if (server_p)
 			f_print(fout, "bool_t ");
 		else
 			f_print(fout, "enum clnt_stat ");
 	} else {
 		ptype(proc->res_prefix, proc->res_type, 1);
 		f_print(fout, "*");
+	}
 	if (server_p)
 		pvname_svc(proc->proc_name, vp->vers_num);
 	else
 		pvname(proc->proc_name, vp->vers_num);
 	f_print(fout, "(");
 	if (proc->arg_num < 2 && newstyle &&
 	    streq(proc->args.decls->decl.type, "void")) {
 		/* 0 argument in new style:  do nothing */
 	} else {
 		for (dl = proc->args.decls; dl != NULL; dl = dl->next) {
 			ptype(dl->decl.prefix, dl->decl.type, 1);
 			if (!newstyle)
 				f_print(fout, "*");
 			f_print(fout, ", ");
+		}
+	}
 	if (Mflag) {
 		if (streq(proc->res_type, "void"))
 			f_print(fout, "char");
 		else
 			ptype(proc->res_prefix, proc->res_type, 0);
 		if (!isvectordef(proc->res_type, REL_ALIAS))
 			f_print(fout, "*");
 		f_print(fout, ", ");
+	}
 	f_print(fout, "%s);\n", addargtype);
+}
 static void
 penumdef(definition *def)
+{
 	const char *name = def->def_name;
 	enumval_list *l;
 	const char *last = NULL;
 	int count = 0;
 	const char *first = "";
 	f_print(fout, "enum %s {\n", name);
 	for (l = def->def.en.vals; l != NULL; l = l->next) {
 		f_print(fout, "%s\t%s", first, l->name);
 		if (l->assignment) {
 			f_print(fout, " = %s", l->assignment);
 			last = l->assignment;
 			count = 1;
 		} else {
 			if (last == NULL) {
 				f_print(fout, " = %d", count++);
 			} else {
 				f_print(fout, " = %s + %d", last, count++);
+			}
+		}
 		first = ",\n";
+	}
 	f_print(fout, "\n};\n");
 	f_print(fout, "typedef enum %s %s;\n", name, name);
+}
 static void
 ptypedef(definition *def)
+{
 	const char *name = def->def_name;
 	const char *old = def->def.ty.old_type;
 	char    prefix[8];	/* enough to contain "struct ", including NUL */
 	relation rel = def->def.ty.rel;
 	if (!streq(name, old)) {
 		if (streq(old, "string")) {
 			old = "char";
 			rel = REL_POINTER;
 		} else
 			if (streq(old, "opaque")) {
 				old = "char";
 			} 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;
+		}
 		f_print(fout, ";\n");
+	}
+}
 void
 pdeclaration(const char *name, declaration *dec, int tab,
 	     const char *separator)
+{
 	char    buf[8];		/* enough to hold "struct ", include NUL */
 	const char *prefix;
 	const char *type;
 	if (streq(dec->type, "void")) {
 		return;
+	}
 	tabify(fout, tab);
 	if (streq(dec->type, name) && !dec->prefix) {
 		f_print(fout, "struct ");
+	}
 	if (streq(dec->type, "string")) {
 		f_print(fout, "char *%s", dec->name);
 	} else {
 		prefix = "";
 		if (streq(dec->type, "bool")) {
 			type = "bool_t";
 		} else
 			if (streq(dec->type, "opaque")) {
 				type = "char";
 			} else {
 				if (dec->prefix) {
 					s_print(buf, "%s ", dec->prefix);
 					prefix = buf;
+				}
 				type = dec->type;
+			}
 		switch (dec->rel) {
 		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)
+{
 	list   *l;
 	definition *def;
 	for (l = defined; l != NULL; l = l->next) {
 		def = (definition *) l->val;
 		if (def->def_kind != DEF_PROGRAM) {
 			if (streq(def->def_name, stop)) {
 				return (1);
 			} else
 				if (streq(def->def_name, type)) {
 					return (0);
+				}
+		}
+	}
 	return (1);
+}

 @@ -1,618 +1,618 @@
-/*	$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.
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
+ *
  * Sun Microsystems, Inc.
  * 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"
 #include "rpc_util.h"
 #define ARGNAME "arg"
 static void isdefined(definition *);
 static void def_struct(definition *);
 static void def_program(definition *);
 static void def_enum(definition *);
 static void def_const(definition *);
 static void def_union(definition *);
 static void check_type_name(const char *, int);
 static void def_typedef(definition *);
 static void get_declaration(declaration *, defkind);
 static void get_prog_declaration(declaration *, defkind, int);
 static void get_type(const char **, const char **, defkind);
 static void unsigned_dec(const char **);
 /*
  * return the next definition you see
  */
 definition *
 get_definition(void)
+{
 	definition *defp;
 	token   tok;
 	defp = ALLOC(definition);
 	get_token(&tok);
 	switch (tok.kind) {
 	case TOK_STRUCT:
 		def_struct(defp);
 		break;
 	case TOK_UNION:
 		def_union(defp);
 		break;
 	case TOK_TYPEDEF:
 		def_typedef(defp);
 		break;
 	case TOK_ENUM:
 		def_enum(defp);
 		break;
 	case TOK_PROGRAM:
 		def_program(defp);
 		break;
 	case TOK_CONST:
 		def_const(defp);
 		break;
 	case TOK_EOF:
 		free(defp);
 		return (NULL);
 	default:
 		error("Expected definition keyword");
+	}
 	scan(TOK_SEMICOLON, &tok);
 	isdefined(defp);
 	return (defp);
+}
 static void
 isdefined(definition *defp)
+{
 	STOREVAL(&defined, defp);
+}
 static void
 def_struct(definition *defp)
+{
 	token   tok;
 	declaration dec;
 	decl_list *decls;
 	decl_list **tailp;
 	defp->def_kind = DEF_STRUCT;
 	scan(TOK_IDENT, &tok);
 	defp->def_name = tok.str;
 	scan(TOK_LBRACE, &tok);
 	tailp = &defp->def.st.decls;
 	do {
 		get_declaration(&dec, DEF_STRUCT);
 		decls = ALLOC(decl_list);
 		decls->decl = dec;
 		*tailp = decls;
 		tailp = &decls->next;
 		scan(TOK_SEMICOLON, &tok);
 		peek(&tok);
 	} while (tok.kind != TOK_RBRACE);
 	get_token(&tok);
 	*tailp = NULL;
+}
 static void
 def_program(definition *defp)
+{
 	token   tok;
 	declaration dec;
 	decl_list *decls;
 	decl_list **tailp;
 	version_list *vlist;
 	version_list **vtailp;
 	proc_list *plist;
 	proc_list **ptailp;
 	int     num_args;
 	bool_t  isvoid = FALSE;	/* whether first argument is void */
 	defp->def_kind = DEF_PROGRAM;
 	scan(TOK_IDENT, &tok);
 	defp->def_name = tok.str;
 	scan(TOK_LBRACE, &tok);
 	vtailp = &defp->def.pr.versions;
 	tailp = &defp->def.st.decls;
 	scan(TOK_VERSION, &tok);
 	do {
 		scan(TOK_IDENT, &tok);
 		vlist = ALLOC(version_list);
 		vlist->vers_name = tok.str;
 		scan(TOK_LBRACE, &tok);
 		ptailp = &vlist->procs;
 		do {
 			/* get result type */
 			plist = ALLOC(proc_list);
 			get_type(&plist->res_prefix, &plist->res_type,
 			    DEF_PROGRAM);
 			if (streq(plist->res_type, "opaque")) {
 				error("Illegal result type");
+			}
 			scan(TOK_IDENT, &tok);
 			plist->proc_name = tok.str;
 			scan(TOK_LPAREN, &tok);
 			/* get args - first one */
 			num_args = 1;
 			isvoid = FALSE;
 			/* type of DEF_PROGRAM in the first
 			 * get_prog_declaration and DEF_STURCT in the next
 			 * allows void as argument if it is the only argument */
 			get_prog_declaration(&dec, DEF_PROGRAM, num_args);
 			if (streq(dec.type, "void"))
 				isvoid = TRUE;
 			decls = ALLOC(decl_list);
 			plist->args.decls = decls;
 			decls->decl = dec;
 			tailp = &decls->next;
 			/* get args */
 			while (peekscan(TOK_COMMA, &tok)) {
 				num_args++;
 				get_prog_declaration(&dec, DEF_STRUCT,
 				    num_args);
 				decls = ALLOC(decl_list);
 				decls->decl = dec;
 				*tailp = decls;
 				if (streq(dec.type, "void"))
 					isvoid = TRUE;
 				tailp = &decls->next;
+			}
 			/* multiple arguments are only allowed in newstyle */
 			if (!newstyle && num_args > 1) {
 				error("Only one argument is allowed");
+			}
 			if (isvoid && num_args > 1) {
 				error("Illegal use of void in program definition");
+			}
 			*tailp = NULL;
 			scan(TOK_RPAREN, &tok);
 			scan(TOK_EQUAL, &tok);
 			scan_num(&tok);
 			scan(TOK_SEMICOLON, &tok);
 			plist->proc_num = tok.str;
 			plist->arg_num = num_args;
 			*ptailp = plist;
 			ptailp = &plist->next;
 			peek(&tok);
 		} while (tok.kind != TOK_RBRACE);
 		*ptailp = NULL;
 		*vtailp = vlist;
 		vtailp = &vlist->next;
 		scan(TOK_RBRACE, &tok);
 		scan(TOK_EQUAL, &tok);
 		scan_num(&tok);
 		vlist->vers_num = tok.str;
 		/* make the argument structure name for each arg */
 		for (plist = vlist->procs; plist != NULL;
 		    plist = plist->next) {
 			plist->args.argname = make_argname(plist->proc_name,
 			    vlist->vers_num);
 			/* free the memory ?? */
+		}
 		scan(TOK_SEMICOLON, &tok);
 		scan2(TOK_VERSION, TOK_RBRACE, &tok);
 	} while (tok.kind == TOK_VERSION);
 	scan(TOK_EQUAL, &tok);
 	scan_num(&tok);
 	defp->def.pr.prog_num = tok.str;
 	*vtailp = NULL;
+}
 static void
 def_enum(definition *defp)
+{
 	token   tok;
 	enumval_list *elist;
 	enumval_list **tailp;
 	defp->def_kind = DEF_ENUM;
 	scan(TOK_IDENT, &tok);
 	defp->def_name = tok.str;
 	scan(TOK_LBRACE, &tok);
 	tailp = &defp->def.en.vals;
 	do {
 		scan(TOK_IDENT, &tok);
 		elist = ALLOC(enumval_list);
 		elist->name = tok.str;
 		elist->assignment = NULL;
 		scan3(TOK_COMMA, TOK_RBRACE, TOK_EQUAL, &tok);
 		if (tok.kind == TOK_EQUAL) {
 			scan_num(&tok);
 			elist->assignment = tok.str;
 			scan2(TOK_COMMA, TOK_RBRACE, &tok);
+		}
 		*tailp = elist;
 		tailp = &elist->next;
 	} while (tok.kind != TOK_RBRACE);
 	*tailp = NULL;
+}
 static void
 def_const(definition *defp)
+{
 	token   tok;
 	defp->def_kind = DEF_CONST;
 	scan(TOK_IDENT, &tok);
 	defp->def_name = tok.str;
 	scan(TOK_EQUAL, &tok);
 	scan2(TOK_IDENT, TOK_STRCONST, &tok);
 	defp->def.co = tok.str;
+}
 static void
 def_union(definition *defp)
+{
 	token   tok;
 	declaration dec;
 	case_list *cases;
 	case_list **tailp;
 	defp->def_kind = DEF_UNION;
 	scan(TOK_IDENT, &tok);
 	defp->def_name = tok.str;
 	scan(TOK_SWITCH, &tok);
 	scan(TOK_LPAREN, &tok);
 	get_declaration(&dec, DEF_UNION);
 	defp->def.un.enum_decl = dec;
 	tailp = &defp->def.un.cases;
 	scan(TOK_RPAREN, &tok);
 	scan(TOK_LBRACE, &tok);
 	scan(TOK_CASE, &tok);
 	while (tok.kind == TOK_CASE) {
 		scan2(TOK_IDENT, TOK_CHARCONST, &tok);
 		cases = ALLOC(case_list);
 		cases->case_name = tok.str;
 		scan(TOK_COLON, &tok);
 		/* now peek at next token */
 		if (peekscan(TOK_CASE, &tok)) {
 			do {
 				scan2(TOK_IDENT, TOK_CHARCONST, &tok);
 				cases->contflag = 1;	/* continued case
 							 * statement */
 				*tailp = cases;
 				tailp = &cases->next;
 				cases = ALLOC(case_list);
 				cases->case_name = tok.str;
 				scan(TOK_COLON, &tok);
 			} while (peekscan(TOK_CASE, &tok));
+		}
 		get_declaration(&dec, DEF_UNION);
 		cases->case_decl = dec;
 		cases->contflag = 0;	/* no continued case statement */
 		*tailp = cases;
 		tailp = &cases->next;
 		scan(TOK_SEMICOLON, &tok);
 		scan3(TOK_CASE, TOK_DEFAULT, TOK_RBRACE, &tok);
+	}
 	*tailp = NULL;
 	if (tok.kind == TOK_DEFAULT) {
 		scan(TOK_COLON, &tok);
 		get_declaration(&dec, DEF_UNION);
 		defp->def.un.default_decl = ALLOC(declaration);
 		*defp->def.un.default_decl = dec;
 		scan(TOK_SEMICOLON, &tok);
 		scan(TOK_RBRACE, &tok);
 	} else {
 		defp->def.un.default_decl = NULL;
+	}
+}
 static const char *const reserved_words[] = {
 	"array",
 	"bytes",
 	"destroy",
 	"free",
 	"getpos",
 	"inline",
 	"pointer",
 	"reference",
 	"setpos",
 	"sizeof",
 	"union",
 	"vector",
 	NULL
 };
 static const char *const reserved_types[] = {
 	"opaque",
 	"string",
 	NULL
 };
 /* check that the given name is not one that would eventually result in
    xdr routines that would conflict with internal XDR routines. */
 static void
 check_type_name(const char *name, int new_type)
+{
 	int     i;
 	for (i = 0; reserved_words[i] != NULL; i++) {
 		if (strcmp(name, reserved_words[i]) == 0) {
 			error("Illegal (reserved) name '%s' in type definition", name);
+		}
+	}
 	if (new_type) {
 		for (i = 0; reserved_types[i] != NULL; i++) {
 			if (strcmp(name, reserved_types[i]) == 0) {
 				error("Illegal (reserved) name '%s' in type definition", name);
+			}
+		}
+	}
+}
 static void
 def_typedef(definition *defp)
+{
 	declaration dec;
 	defp->def_kind = DEF_TYPEDEF;
 	get_declaration(&dec, DEF_TYPEDEF);
 	defp->def_name = dec.name;
 	check_type_name(dec.name, 1);
 	defp->def.ty.old_prefix = dec.prefix;
 	defp->def.ty.old_type = dec.type;
 	defp->def.ty.rel = dec.rel;
 	defp->def.ty.array_max = dec.array_max;
+}
 static void
 get_declaration(declaration *dec, defkind dkind)
+{
 	token   tok;
 	get_type(&dec->prefix, &dec->type, dkind);
 	dec->rel = REL_ALIAS;
 	if (streq(dec->type, "void")) {
 		return;
+	}
 	check_type_name(dec->type, 0);
 	scan2(TOK_STAR, TOK_IDENT, &tok);
 	if (tok.kind == TOK_STAR) {
 		dec->rel = REL_POINTER;
 		scan(TOK_IDENT, &tok);
+	}
 	dec->name = tok.str;
 	if (peekscan(TOK_LBRACKET, &tok)) {
 		if (dec->rel == REL_POINTER) {
 			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")) {
 			if (dec->rel != REL_ARRAY) {
 				error("Variable-length array declaration expected");
+			}
+		}
+}
 static void
 get_prog_declaration(declaration *dec, defkind dkind, int num /* arg number */)
+{
 	token   tok;
 	char    name[255];	/* argument name */
 	if (dkind == DEF_PROGRAM) {
 		peek(&tok);
 		if (tok.kind == TOK_RPAREN) {	/* no arguments */
 			dec->rel = REL_ALIAS;
 			dec->type = "void";
 			dec->prefix = NULL;
 			dec->name = NULL;
 			return;
+		}
+	}
 	get_type(&dec->prefix, &dec->type, dkind);
 	dec->rel = REL_ALIAS;
 	if (peekscan(TOK_IDENT, &tok))	/* optional name of argument */
 		strcpy(name, tok.str);
 	else
 		sprintf(name, "%s%d", ARGNAME, num);	/* default name of
 							 * argument */
 	dec->name = strdup(name);
 	if (streq(dec->type, "void")) {
 		return;
+	}
 	if (streq(dec->type, "opaque")) {
 		error("Opaque -- illegal argument type");
+	}
 	if (peekscan(TOK_STAR, &tok)) {
 		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;
 	get_token(&tok);
 	switch (tok.kind) {
 	case TOK_IDENT:
 		*typep = tok.str;
 		break;
 	case TOK_STRUCT:
 	case TOK_ENUM:
 	case TOK_UNION:
 		*prefixp = tok.str;
 		scan(TOK_IDENT, &tok);
 		*typep = tok.str;
 		break;
 	case TOK_UNSIGNED:
 		unsigned_dec(typep);
 		break;
 	case TOK_SHORT:
 		*typep = "short";
 		(void) peekscan(TOK_INT, &tok);
 		break;
 	case TOK_LONG:
 		*typep = "long";
 		(void) peekscan(TOK_INT, &tok);
 		break;
 	case TOK_HYPER:
 		*typep = "longlong_t";
 		(void) peekscan(TOK_INT, &tok);
 		break;
 	case TOK_VOID:
 		if (dkind != DEF_UNION && dkind != DEF_PROGRAM) {
 			error("Void is allowed only inside union and program definitions with one argument");
+		}
 		*typep = tok.str;
 		break;
 	case TOK_STRING:
 	case TOK_OPAQUE:
 	case TOK_CHAR:
 	case TOK_INT:
 	case TOK_FLOAT:
 	case TOK_DOUBLE:
 	case TOK_BOOL:
 	case TOK_QUAD:
 		*typep = tok.str;
 		break;
 	default:
 		error("Type specifier expected");
+	}
+}
 static void
 unsigned_dec(const char **typep)
+{
 	token   tok;
 	peek(&tok);
 	switch (tok.kind) {
 	case TOK_CHAR:
 		get_token(&tok);
 		*typep = "u_char";
 		break;
 	case TOK_SHORT:
 		get_token(&tok);
 		*typep = "u_short";
 		(void) peekscan(TOK_INT, &tok);
 		break;
 	case TOK_LONG:
 		get_token(&tok);
 		*typep = "u_long";
 		(void) peekscan(TOK_INT, &tok);
 		break;
 	case TOK_HYPER:
 		get_token(&tok);
 		*typep = "u_longlong_t";
 		(void) peekscan(TOK_INT, &tok);
 		break;
 	case TOK_INT:
 		get_token(&tok);
 		*typep = "u_int";
 		break;
 	default:
 		*typep = "u_int";
 		break;
+	}
+}

 @@ -1,181 +1,181 @@
-/*	$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.
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
+ *
  * Sun Microsystems, Inc.
  * 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"
 #define TABSIZE		8
 #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;
 		if (def->def_kind == DEF_PROGRAM) {
 			write_table(def);
+		}
+	}
+}
 static void
 write_table(definition *def)
+{
 	version_list *vp;
 	proc_list *proc;
 	int     current;
 	int     expected;
 	char    progvers[100];
 	int     warning;
 	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
 		warning = 0;
 		s_print(progvers, "%s_%s",
 		    locase(def->def_name), vp->vers_num);
 		/* print the table header */
 		f_print(fout, tbl_hdr, progvers);
 		if (nullproc(vp->procs)) {
 			expected = 0;
 		} else {
 			expected = 1;
 			f_print(fout, null_entry);
+		}
 		for (proc = vp->procs; proc != NULL; proc = proc->next) {
 			if (expected != 0)
 				f_print(fout, "\n");
 			current = atoi(proc->proc_num);
 			if (current != expected++) {
 				f_print(fout,
 				    "/*\n * WARNING: table out of order\n */\n\n");
 				if (warning == 0) {
 					f_print(stderr,
 					    "WARNING %s table is out of order\n",
 					    progvers);
 					warning = 1;
 					nonfatalerrors = 1;
+				}
 				expected = current + 1;
+			}
 			f_print(fout, "\t(char *(*)())RPCGEN_ACTION(");
 			/* routine to invoke */
 			if (!newstyle)
 				pvname_svc(proc->proc_name, vp->vers_num);
 			else {
 				if (newstyle)
 					f_print(fout, "_");	/* calls internal func */
 				pvname(proc->proc_name, vp->vers_num);
+			}
 			f_print(fout, "),\n");
 			/* argument info */
 			if (proc->arg_num > 1)
 				printit(NULL, proc->args.argname);
 			else
 				/* do we have to do something special for
 				 * newstyle */
 				printit(proc->args.decls->decl.prefix,
 				    proc->args.decls->decl.type);
 			/* result info */
 			printit(proc->res_prefix, proc->res_type);
+		}
 		/* print the table trailer */
 		f_print(fout, tbl_end);
 		f_print(fout, tbl_nproc, progvers, progvers, progvers);
+	}
+}
 static void
 printit(const char *prefix, const char *type)
+{
 	int     len;
 	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");
+}