s/inline/doinline/; christos

4 files changed, 16 insertions, 18 deletions

diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index b5decaa437a..ca57fb63f9c 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,9 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:50:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/10/11 21:10:40 deraadt Exp $
 
 PROG=	rpcgen
 SRCS=	rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c rpc_parse.c rpc_scan.c \
 	rpc_svcout.c rpc_util.c rpc_sample.c rpc_tblout.c
 
-CFLAGS += -ansi
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index c611c095aed..a3112016981 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.3 1996/12/10 15:29:34 deraadt Exp $	*/
+/*	$OpenBSD: rpc_cout.c,v 1.4 1997/10/11 21:10:41 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
@@ -171,7 +171,7 @@ print_header(def)
 	/* Now add Inline support */
 
 
-	if (inline == 0)
+	if (doinline == 0)
 		return;
 	/* May cause lint to complain. but  ... */
 	f_print(fout, "\t register int32_t *buf;\n\n");
@@ -420,7 +420,7 @@ emit_struct(def)
 	int     can_inline;
 
 
-	if (inline == 0) {
+	if (doinline == 0) {
 		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
 			print_stat(1, &dl->decl);
 		return;
@@ -444,13 +444,13 @@ emit_struct(def)
 				break;	/* can be inlined */
 			};
 		} else {
-			if (size >= inline) {
+			if (size >= doinline) {
 				can_inline = 1;
 				break;	/* can be inlined */
 			}
 			size = 0;
 		}
-	if (size > inline)
+	if (size > doinline)
 		can_inline = 1;
 
 	if (can_inline == 0) {	/* can not inline, drop back to old mode */
@@ -515,9 +515,9 @@ emit_struct(def)
 
 			} else {
 				if (i > 0)
-					if (sizestr == NULL && size < inline) {
+					if (sizestr == NULL && size < doinline) {
 						/* don't expand into inline
-						 * code if size < inline */
+						 * code if size < doinline */
 						while (cur != dl) {
 							print_stat(1, &cur->decl);
 							cur = cur->next;
@@ -567,9 +567,9 @@ emit_struct(def)
 
 		}
 		if (i > 0)
-			if (sizestr == NULL && size < inline) {
+			if (sizestr == NULL && size < doinline) {
 				/* don't expand into inline code if size <
-				 * inline */
+				 * doinline */
 				while (cur != dl) {
 					print_stat(1, &cur->decl);
 					cur = cur->next;
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index b458729f00c..b4faa61af64 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_main.c,v 1.2 1996/03/27 19:32:51 niklas Exp $	*/
+/*	$OpenBSD: rpc_main.c,v 1.3 1997/10/11 21:10:41 deraadt Exp $	*/
 /*	$NetBSD: rpc_main.c,v 1.9 1996/02/19 11:12:43 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
-static char cvsid[] = "$OpenBSD: rpc_main.c,v 1.2 1996/03/27 19:32:51 niklas Exp $";
+static char cvsid[] = "$OpenBSD: rpc_main.c,v 1.3 1997/10/11 21:10:41 deraadt Exp $";
 #endif
 
 /*
@@ -112,7 +112,7 @@ int callerflag;		/* Generate svc_caller() function */
 #define INLINE 3
 /*length at which to start doing an inline */
 
-int inline=INLINE;  /* length at which to start doing an inline. 3 = default
+int doinline=INLINE;  /* length at which to start doing an inline. 3 = default
 		if 0, no xdr_inline code */
 
 int indefinitewait;	/* If started by port monitors, hang till it wants */
@@ -1012,7 +1012,7 @@ parseargs(argc, argv, cmd)
 				  	if (++i == argc) {
 						return (0);
 					}
-					inline = atoi(argv[i]);
+					doinline = atoi(argv[i]);
 					goto nextarg;
 				case 'n':
 				case 'o':
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 9eaa5a917e7..42d4648540d 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_util.h,v 1.2 1996/06/26 05:38:42 deraadt Exp $	*/
+/*	$OpenBSD: rpc_util.h,v 1.3 1997/10/11 21:10:42 deraadt Exp $	*/
 /*	$NetBSD: rpc_util.h,v 1.3 1995/06/11 21:50:10 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -79,7 +79,7 @@ extern int logflag;
 extern int newstyle;
 extern int Cflag;     /* C++ flag */
 extern int tirpcflag; /* flag for generating tirpc code */
-extern int inline; /* if this is 0, then do not generate inline code */
+extern int doinline; /* if this is 0, then do not generate inline code */
 extern int callerflag;
 
 /*