cleanups

1 files changed, 78 insertions, 73 deletions

diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index c15cee08fb2..9b0915ed6a3 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_cout.c,v 1.11 2002/02/16 21:27:51 millert Exp $	*/
+/*	$OpenBSD: rpc_cout.c,v 1.12 2002/06/01 01:40:38 deraadt Exp $	*/
 /*	$NetBSD: rpc_cout.c,v 1.6 1996/10/01 04:13:53 cgd Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -135,22 +135,22 @@ print_generic_header(procname, pointerp)
 	char	*procname;
 	int	pointerp;
 {
-	f_print(fout, "\n");
-	f_print(fout, "bool_t\n");
+	fprintf(fout, "\n");
+	fprintf(fout, "bool_t\n");
 	if (Cflag) {
-		f_print(fout, "xdr_%s(", procname);
-		f_print(fout, "XDR *xdrs, ");
-		f_print(fout, "%s ", procname);
+		fprintf(fout, "xdr_%s(", procname);
+		fprintf(fout, "XDR *xdrs, ");
+		fprintf(fout, "%s ", procname);
 		if (pointerp)
-			f_print(fout, "*");
-		f_print(fout, "objp)\n{\n");
+			fprintf(fout, "*");
+		fprintf(fout, "objp)\n{\n");
 	} else {
-		f_print(fout, "xdr_%s(xdrs, objp)\n", procname);
-		f_print(fout, "\tXDR *xdrs;\n");
-		f_print(fout, "\t%s ", procname);
+		fprintf(fout, "xdr_%s(xdrs, objp)\n", procname);
+		fprintf(fout, "\tXDR *xdrs;\n");
+		fprintf(fout, "\t%s ", procname);
 		if (pointerp)
-			f_print(fout, "*");
-		f_print(fout, "objp;\n{\n");
+			fprintf(fout, "*");
+		fprintf(fout, "objp;\n{\n");
 	}
 }
 
@@ -167,7 +167,7 @@ print_header(def)
 	if (doinline == 0)
 		return;
 	/* May cause lint to complain. but  ... */
-	f_print(fout, "\tint32_t *buf;\n\n");
+	fprintf(fout, "\tint32_t *buf;\n\n");
 }
 
 static void
@@ -180,8 +180,8 @@ print_prog_header(plist)
 static void
 print_trailer()
 {
-	f_print(fout, "\treturn (TRUE);\n");
-	f_print(fout, "}\n");
+	fprintf(fout, "\treturn (TRUE);\n");
+	fprintf(fout, "}\n");
 }
 
 static void
@@ -190,14 +190,14 @@ print_ifopen(indent, name)
 	char   *name;
 {
 	tabify(fout, indent);
-	f_print(fout, "if (!xdr_%s(xdrs", name);
+	fprintf(fout, "if (!xdr_%s(xdrs", name);
 }
 
 static void
 print_ifarg(arg)
 	char   *arg;
 {
-	f_print(fout, ", %s", arg);
+	fprintf(fout, ", %s", arg);
 }
 
 static void
@@ -206,13 +206,13 @@ print_ifsizeof(prefix, type)
 	char   *type;
 {
 	if (streq(type, "bool")) {
-		f_print(fout, ", sizeof(bool_t), (xdrproc_t)xdr_bool");
+		fprintf(fout, ", sizeof(bool_t), (xdrproc_t)xdr_bool");
 	} else {
-		f_print(fout, ", sizeof(");
+		fprintf(fout, ", sizeof(");
 		if (undefined(type) && prefix) {
-			f_print(fout, "%s ", prefix);
+			fprintf(fout, "%s ", prefix);
 		}
-		f_print(fout, "%s), (xdrproc_t)xdr_%s", type, type);
+		fprintf(fout, "%s), (xdrproc_t)xdr_%s", type, type);
 	}
 }
 
@@ -220,11 +220,11 @@ static void
 print_ifclose(indent)
 	int     indent;
 {
-	f_print(fout, ")) {\n");
+	fprintf(fout, ")) {\n");
 	tabify(fout, indent);
-	f_print(fout, "\treturn (FALSE);\n");
+	fprintf(fout, "\treturn (FALSE);\n");
 	tabify(fout, indent);
-	f_print(fout, "}\n");
+	fprintf(fout, "}\n");
 }
 
 static void
@@ -243,7 +243,7 @@ print_ifstat(indent, prefix, type, rel, amax, objname, name)
 	case REL_POINTER:
 		print_ifopen(indent, "pointer");
 		print_ifarg("(char **)");
-		f_print(fout, "%s", objname);
+		fprintf(fout, "%s", objname);
 		print_ifsizeof(prefix, type);
 		break;
 	case REL_VECTOR:
@@ -259,7 +259,7 @@ print_ifstat(indent, prefix, type, rel, amax, objname, name)
 		} else {
 			print_ifopen(indent, "vector");
 			print_ifarg("(char *)");
-			f_print(fout, "%s", objname);
+			fprintf(fout, "%s", objname);
 		}
 		print_ifarg(amax);
 		if (!alt) {
@@ -284,10 +284,10 @@ print_ifstat(indent, prefix, type, rel, amax, objname, name)
 			}
 			print_ifarg("(char **)");
 			if (*objname == '&') {
-				f_print(fout, "%s.%s_val, (u_int *)%s.%s_len",
+				fprintf(fout, "%s.%s_val, (u_int *)%s.%s_len",
 				    objname, name, objname, name);
 			} else {
-				f_print(fout, "&%s->%s_val, (u_int *)&%s->%s_len",
+				fprintf(fout, "&%s->%s_val, (u_int *)&%s->%s_len",
 				    objname, name, objname, name);
 			}
 		}
@@ -347,9 +347,9 @@ emit_union(def)
 	char   *format = "&objp->%s_u.%s";
 
 	print_stat(1, &def->def.un.enum_decl);
-	f_print(fout, "\tswitch (objp->%s) {\n", def->def.un.enum_decl.name);
+	fprintf(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);
+		fprintf(fout, "\tcase %s:\n", cl->case_name);
 		if (cl->contflag == 1)	/* a continued case statement */
 			continue;
 		cs = &cl->case_decl;
@@ -357,43 +357,43 @@ emit_union(def)
 			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,
+				sprintf(object, vecformat, def->def_name,
 				    cs->name);
 			} else {
-				s_print(object, format, def->def_name,
+				sprintf(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");
+		fprintf(fout, "\t\tbreak;\n");
 	}
 	dflt = def->def.un.default_decl;
 	if (dflt != NULL) {
 		if (!streq(dflt->type, "void")) {
-			f_print(fout, "\tdefault:\n");
+			fprintf(fout, "\tdefault:\n");
 			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,
+				sprintf(object, vecformat, def->def_name,
 				    dflt->name);
 			} else {
-				s_print(object, format, def->def_name,
+				sprintf(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");
+			fprintf(fout, "\t\tbreak;\n");
 		}
 	} else {
-		f_print(fout, "\tdefault:\n");
-		f_print(fout, "\t\treturn (FALSE);\n");
+		fprintf(fout, "\tdefault:\n");
+		fprintf(fout, "\t\treturn (FALSE);\n");
 	}
 
-	f_print(fout, "\t}\n");
+	fprintf(fout, "\t}\n");
 }
 
 static void
@@ -415,7 +415,7 @@ emit_struct(def)
 	}
 	for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
 		if (dl->decl.rel == REL_VECTOR) {
-			f_print(fout, "\tint i;\n");
+			fprintf(fout, "\tint i;\n");
 			break;
 		}
 	size = 0;
@@ -449,9 +449,9 @@ emit_struct(def)
 	flag = PUT;
 	for (j = 0; j < 2; j++) {
 		if (flag == PUT)
-			f_print(fout, "\n\tif (xdrs->x_op == XDR_ENCODE) {\n");
+			fprintf(fout, "\n\tif (xdrs->x_op == XDR_ENCODE) {\n");
 		else
-			f_print(fout, "\t\treturn (TRUE);\n\t} else if (xdrs->x_op == XDR_DECODE) {\n");
+			fprintf(fout, "\t\treturn (TRUE);\n\t} else if (xdrs->x_op == XDR_DECODE) {\n");
 
 		i = 0;
 		size = 0;
@@ -477,9 +477,14 @@ emit_struct(def)
 						plus = "+";
 
 					if (ptr->length != 1)
-						s_print(ptemp, " %s %s * %d", plus, dl->decl.array_max, ptr->length);
+						snprintf(ptemp, sizeof ptemp,
+						    " %s %s * %d", plus,
+						    dl->decl.array_max,
+						    ptr->length);
 					else
-						s_print(ptemp, " %s %s ", plus, dl->decl.array_max);
+						snprintf(ptemp, sizeof ptemp,
+						    " %s %s ", plus,
+						    dl->decl.array_max);
 
 					/* now concatenate to sizestr !!!! */
 					if (sizestr == NULL)
@@ -487,7 +492,7 @@ emit_struct(def)
 					else {
 						sizestr = (char *)realloc(sizestr, strlen(sizestr) + strlen(ptemp) + 1);
 						if (sizestr == NULL) {
-							f_print(stderr, "Fatal error : no memory\n");
+							fprintf(stderr, "Fatal error : no memory\n");
 							crash();
 						}
 						sizestr = strcat(sizestr, ptemp);	/* build up length of
@@ -509,19 +514,19 @@ emit_struct(def)
 						/* 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);",
+							fprintf(fout, "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %d * BYTES_PER_XDR_UNIT);",
 							    size);
 						else
 							if (size == 0)
-								f_print(fout,
+								fprintf(fout,
 								    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %s * BYTES_PER_XDR_UNIT);",
 								    sizestr);
 							else
-								f_print(fout,
+								fprintf(fout,
 								    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, (%d + %s)* BYTES_PER_XDR_UNIT);",
 								    size, sizestr);
 
-						f_print(fout, "\n\t\tif (buf == NULL) {\n");
+						fprintf(fout, "\n\t\tif (buf == NULL) {\n");
 
 						psav = cur;
 						while (cur != dl) {
@@ -529,7 +534,7 @@ emit_struct(def)
 							cur = cur->next;
 						}
 
-						f_print(fout, "\t\t} else {\n");
+						fprintf(fout, "\t\t} else {\n");
 
 						cur = psav;
 						while (cur != dl) {
@@ -537,7 +542,7 @@ emit_struct(def)
 							cur = cur->next;
 						}
 
-						f_print(fout, "\t\t}\n");
+						fprintf(fout, "\t\t}\n");
 					}
 				}
 				size = 0;
@@ -559,26 +564,26 @@ emit_struct(def)
 				/* 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);",
+					fprintf(fout, "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %d * BYTES_PER_XDR_UNIT);",
 					    size);
 				else
 					if (size == 0)
-						f_print(fout,
+						fprintf(fout,
 						    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, %s * BYTES_PER_XDR_UNIT);",
 						    sizestr);
 					else
-						f_print(fout,
+						fprintf(fout,
 						    "\t\tbuf = (int32_t *)XDR_INLINE(xdrs, (%d + %s)* BYTES_PER_XDR_UNIT);",
 						    size, sizestr);
 
-				f_print(fout, "\n\t\tif (buf == NULL) {\n");
+				fprintf(fout, "\n\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");
+				fprintf(fout, "\t\t} else {\n");
 
 				cur = psav;
 				while (cur != dl) {
@@ -586,13 +591,13 @@ emit_struct(def)
 					cur = cur->next;
 				}
 
-				f_print(fout, "\t\t}\n");
+				fprintf(fout, "\t\t}\n");
 
 			}
 		}
 		flag = GET;
 	}
-	f_print(fout, "\t\treturn (TRUE);\n\t}\n\n");
+	fprintf(fout, "\t\treturn (TRUE);\n\t}\n\n");
 
 	/* now take care of XDR_FREE case */
 
@@ -624,9 +629,9 @@ print_stat(indent, dec)
 	char    name[256];
 
 	if (isvectordef(type, rel)) {
-		s_print(name, "objp->%s", dec->name);
+		snprintf(name, sizeof name, "objp->%s", dec->name);
 	} else {
-		s_print(name, "&objp->%s", dec->name);
+		snprintf(name, sizeof name, "&objp->%s", dec->name);
 	}
 	print_ifstat(indent, prefix, type, rel, amax, name, dec->name);
 }
@@ -642,15 +647,15 @@ emit_inline(decl, flag)
 
 	switch (decl->rel) {
 	case REL_ALIAS:
-		f_print(fout, "\t");
+		fprintf(fout, "\t");
 		emit_single_in_line(decl, flag, REL_ALIAS);
 		break;
 	case REL_VECTOR:
-		f_print(fout, "\t\t\t{\n\t\t\t\t%s *genp;\n\n", decl->type);
-		f_print(fout, "\t\t\t\tfor (i = 0, genp = objp->%s;\n\t\t\t\t    i < %s; i++) {\n\t\t\t",
+		fprintf(fout, "\t\t\t{\n\t\t\t\t%s *genp;\n\n", decl->type);
+		fprintf(fout, "\t\t\t\tfor (i = 0, genp = objp->%s;\n\t\t\t\t    i < %s; i++) {\n\t\t\t",
 		    decl->name, decl->array_max);
 		emit_single_in_line(decl, flag, REL_VECTOR);
-		f_print(fout, "\t\t\t\t}\n\t\t\t}\n");
+		fprintf(fout, "\t\t\t\t}\n\t\t\t}\n");
 
 	}
 }
@@ -665,12 +670,12 @@ emit_single_in_line(decl, flag, rel)
 	int     freed = 0;
 
 	if (flag == PUT)
-		f_print(fout, "\t\tIXDR_PUT_");
+		fprintf(fout, "\t\tIXDR_PUT_");
 	else
 		if (rel == REL_ALIAS)
-			f_print(fout, "\t\tobjp->%s = IXDR_GET_", decl->name);
+			fprintf(fout, "\t\tobjp->%s = IXDR_GET_", decl->name);
 		else
-			f_print(fout, "\t\t*genp++ = IXDR_GET_");
+			fprintf(fout, "\t\t*genp++ = IXDR_GET_");
 
 	upp_case = upcase(decl->type);
 
@@ -687,12 +692,12 @@ emit_single_in_line(decl, flag, rel)
 	}
 	if (flag == PUT)
 		if (rel == REL_ALIAS)
-			f_print(fout, "%s(buf, objp->%s);\n", upp_case, decl->name);
+			fprintf(fout, "%s(buf, objp->%s);\n", upp_case, decl->name);
 		else
-			f_print(fout, "%s(buf, *genp++);\n", upp_case);
+			fprintf(fout, "%s(buf, *genp++);\n", upp_case);
 
 	else
-		f_print(fout, "%s(buf);\n", upp_case);
+		fprintf(fout, "%s(buf);\n", upp_case);
 	if (!freed)
 		free(upp_case);
 }
@@ -705,7 +710,7 @@ upcase(str)
 
 	ptr = (char *) malloc(strlen(str)+1);
 	if (ptr == (char *) NULL) {
-		f_print(stderr, "malloc failed\n");
+		fprintf(stderr, "malloc failed\n");
 		exit(1);
 	}