Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

12 files changed, 142 insertions, 142 deletions

diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index aabe048f71d..d2be67e1e3a 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_clntout.c,v 1.8 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_clntout.c,v 1.9 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_clntout.c,v 1.4 1995/06/11 21:49:52 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -44,8 +44,8 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-static void write_program __P((definition *));
-static void printbody __P((proc_list *));
+static void write_program(definition *);
+static void printbody(proc_list *);
 
 extern void pdeclaration();
 
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 7c241055a84..c15cee08fb2 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.10 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_cout.c,v 1.11 2002/02/16 21:27:51 millert 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
@@ -45,26 +45,26 @@ static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-static int findtype __P((definition *, char *));
-static int undefined __P((char *));
-static void print_generic_header __P((char *, int));
-static void print_header __P((definition *));
-static void print_prog_header __P((proc_list *));
-static void print_trailer __P((void));
-static void print_ifopen __P((int, char *));
-static void print_ifarg __P((char *));
-static void print_ifsizeof __P((char *, char *));
-static void print_ifclose __P((int));
-static void print_ifstat __P((int, char *, char *, relation, char *, char *, char *));
-static void emit_num __P((definition *));
-static void emit_program __P((definition *));
-static void emit_enum __P((definition *));
-static void emit_union __P((definition *));
-static void emit_struct __P((definition *));
-static void emit_typedef __P((definition *));
-static void print_stat __P((int, declaration *));
-void emit_inline __P((declaration *, int));
-void emit_single_in_line __P((declaration *, int, relation));
+static int findtype(definition *, char *);
+static int undefined(char *);
+static void print_generic_header(char *, int);
+static void print_header(definition *);
+static void print_prog_header(proc_list *);
+static void print_trailer(void);
+static void print_ifopen(int, char *);
+static void print_ifarg(char *);
+static void print_ifsizeof(char *, char *);
+static void print_ifclose(int);
+static void print_ifstat(int, char *, char *, relation, char *, char *, char *);
+static void emit_num(definition *);
+static void emit_program(definition *);
+static void emit_enum(definition *);
+static void emit_union(definition *);
+static void emit_struct(definition *);
+static void emit_typedef(definition *);
+static void print_stat(int, declaration *);
+void emit_inline(declaration *, int);
+void emit_single_in_line(declaration *, int, relation);
 
 /*
  * Emit the C-routine for the given definition
@@ -631,7 +631,7 @@ print_stat(indent, dec)
 	print_ifstat(indent, prefix, type, rel, amax, name, dec->name);
 }
 
-char   *upcase __P((char *));
+char   *upcase(char *);
 
 void
 emit_inline(decl, flag)
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 8bbc81fe6ba..39760647361 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_hout.c,v 1.9 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_hout.c,v 1.10 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_hout.c,v 1.4 1995/06/11 21:49:55 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -43,18 +43,18 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-static void pconstdef __P((definition *));
-static void pargdef __P((definition *));
-static void pstructdef __P((definition *));
-static void puniondef __P((definition *));
-static void pprogramdef __P((definition *));
-static void penumdef __P((definition *));
-static void ptypedef __P((definition *));
-static void pdefine __P((char *, char *));
-static void puldefine __P((char *, char *));
-static int define_printed __P((proc_list *, version_list *));
-static int undefined2 __P((char *, char *));
-static void parglist __P((proc_list *, char *));
+static void pconstdef(definition *);
+static void pargdef(definition *);
+static void pstructdef(definition *);
+static void puniondef(definition *);
+static void pprogramdef(definition *);
+static void penumdef(definition *);
+static void ptypedef(definition *);
+static void pdefine(char *, char *);
+static void puldefine(char *, char *);
+static int define_printed(proc_list *, version_list *);
+static int undefined2(char *, char *);
+static void parglist(proc_list *, char *);
 void pxdrfuncdecl(char *, int);
 void pprocdef(proc_list *, version_list *, char *, int, int);
 void pdeclaration(char *, declaration *, int, char *);
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 9a006c4711c..46209dbdf88 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.11 2001/12/05 09:50:31 deraadt Exp $	 */
+/* $OpenBSD: rpc_main.c,v 1.12 2002/02/16 21:27:51 millert 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.11 2001/12/05 09:50:31 deraadt Exp $";
+static char     cvsid[] = "$OpenBSD: rpc_main.c,v 1.12 2002/02/16 21:27:51 millert Exp $";
 #endif
 
 /*
@@ -130,20 +130,20 @@ int tirpcflag = 0;	/* generating code for tirpc, by default */
 static char    *dos_cppfile = NULL;
 #endif
 
-static c_output __P((char *, char *, int, char *));
-static h_output __P((char *, char *, int, char *));
-static s_output __P((int, char **, char *, char *, int, char *, int, int));
-static l_output __P((char *, char *, int, char *));
-static t_output __P((char *, char *, int, char *));
-static svc_output __P((char *, char *, int, char *));
-static clnt_output __P((char *, char *, int, char *));
-static do_registers __P((int, char **));
-static void addarg __P((char *));
-static void putarg __P((int, char *));
-static void clear_args __P((void));
-static void checkfiles __P((char *, char *));
-static int parseargs __P((int, char **, struct commandline *));
-static usage    __P((void));
+static c_output(char *, char *, int, char *);
+static h_output(char *, char *, int, char *);
+static s_output(int, char **, char *, char *, int, char *, int, int);
+static l_output(char *, char *, int, char *);
+static t_output(char *, char *, int, char *);
+static svc_output(char *, char *, int, char *);
+static clnt_output(char *, char *, int, char *);
+static do_registers(int, char **);
+static void addarg(char *);
+static void putarg(int, char *);
+static void clear_args(void);
+static void checkfiles(char *, char *);
+static int parseargs(int, char **, struct commandline *);
+static usage(void);
 
 
 int
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index d5ab9cd0072..84c2882dc80 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_parse.c,v 1.8 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_parse.c,v 1.9 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_parse.c,v 1.5 1995/08/29 23:05:55 cgd Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -48,17 +48,17 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 
 #define ARGNAME "arg"
 
-static isdefined __P((definition *));
-static def_struct __P((definition *));
-static def_program __P((definition *));
-static def_enum __P((definition *));
-static def_const __P((definition *));
-static def_union __P((definition *));
-static def_typedef __P((definition *));
-static get_declaration __P((declaration *, defkind));
-static get_prog_declaration __P((declaration *, defkind, int));
-static get_type __P((char **, char **, defkind));
-static unsigned_dec __P((char **));
+static isdefined(definition *);
+static def_struct(definition *);
+static def_program(definition *);
+static def_enum(definition *);
+static def_const(definition *);
+static def_union(definition *);
+static def_typedef(definition *);
+static get_declaration(declaration *, defkind);
+static get_prog_declaration(declaration *, defkind, int);
+static get_type(char **, char **, defkind);
+static unsigned_dec(char **);
 
 /*
  * return the next definition you see
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index a4a41fe0cfc..50d31758dd6 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_sample.c,v 1.10 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_sample.c,v 1.11 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_sample.c,v 1.2 1995/06/11 21:50:01 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -48,9 +48,9 @@ static char sccsid[] = "@(#)rpc_sample.c  1.1  90/08/30  (C) 1987 SMI";
 static char RQSTP[] = "rqstp";
 
 void printarglist();
-static void write_sample_client __P((char *, version_list *));
-static void write_sample_server __P((definition *));
-static void return_type __P((proc_list *));
+static void write_sample_client(char *, version_list *);
+static void write_sample_server(definition *);
+static void return_type(proc_list *);
 
 void
 write_sample_svc(def)
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 08cb93305f9..70f00549750 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_scan.c,v 1.7 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_scan.c,v 1.8 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_scan.c,v 1.4 1995/06/11 21:50:02 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -47,15 +47,15 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-static unget_token __P((token *tokp));
-static findstrconst __P((char **, char **));
-static findchrconst __P((char **, char **));
-static findconst __P((char **, char **));
-static findkind __P((char **, token *));
-static cppline __P((char *));
-static directive __P((char *));
-static printdirective __P((char *));
-static docppline __P((char *, int *, char **));
+static unget_token(token *tokp);
+static findstrconst(char **, char **);
+static findchrconst(char **, char **);
+static findconst(char **, char **);
+static findkind(char **, token *);
+static cppline(char *);
+static directive(char *);
+static printdirective(char *);
+static docppline(char *, int *, char **);
 
 #define startcomment(where) (where[0] == '/' && where[1] == '*')
 #define endcomment(where) (where[-1] == '*' && where[0] == '/')
diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h
index 7bdc7c22a13..55df4778187 100644
--- a/usr.bin/rpcgen/rpc_scan.h
+++ b/usr.bin/rpcgen/rpc_scan.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_scan.h,v 1.2 1996/06/26 05:38:39 deraadt Exp $	*/
+/*	$OpenBSD: rpc_scan.h,v 1.3 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_scan.h,v 1.3 1995/06/11 21:50:04 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -94,14 +94,14 @@ typedef struct token token;
 /*
  * routine interface 
  */
-void scan __P((tok_kind, token *));
-void scan2 __P((tok_kind, tok_kind, token *));
-void scan3 __P((tok_kind, tok_kind, tok_kind, token *));
-void scan_num __P((token *));
-void peek __P((token *));
-int peekscan __P((tok_kind, token *));
-void get_token __P((token *));
+void scan(tok_kind, token *);
+void scan2(tok_kind, tok_kind, token *);
+void scan3(tok_kind, tok_kind, tok_kind, token *);
+void scan_num(token *);
+void peek(token *);
+int peekscan(tok_kind, token *);
+void get_token(token *);
 
-void expected1 __P((tok_kind));
-void expected2 __P((tok_kind, tok_kind));
-void expected3 __P((tok_kind, tok_kind, tok_kind));
+void expected1(tok_kind);
+void expected2(tok_kind, tok_kind);
+void expected3(tok_kind, tok_kind, tok_kind);
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index b5def6125a9..c626ddf02d4 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_svcout.c,v 1.10 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_svcout.c,v 1.11 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_svcout.c,v 1.7 1995/06/24 14:59:59 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -51,20 +51,20 @@ static char ROUTINE[] = "local";
 
 char _errbuf[256];	/* For all messages */
 
-void internal_proctype __P((proc_list *));
-static write_real_program __P((definition *));
-static write_program __P((definition *, char *));
-static printerr __P((char *, char *));
-static printif __P((char *, char *, char *, char *));
-static write_inetmost __P((char *));
-static print_return __P((char *));
-static print_pmapunset __P((char *));
-static print_err_message __P((char *));
-static write_timeout_func __P((void));
-static write_pm_most __P((char *, int));
-static write_caller_func __P((void));
-static write_rpc_svc_fg __P((char *, char *));
-static open_log_file __P((char *, char *));
+void internal_proctype(proc_list *);
+static write_real_program(definition *);
+static write_program(definition *, char *);
+static printerr(char *, char *);
+static printif(char *, char *, char *, char *);
+static write_inetmost(char *);
+static print_return(char *);
+static print_pmapunset(char *);
+static print_err_message(char *);
+static write_timeout_func(void);
+static write_pm_most(char *, int);
+static write_caller_func(void);
+static write_rpc_svc_fg(char *, char *);
+static open_log_file(char *, char *);
 
 static
 p_xdrfunc(rname, typename)
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 3bf257ba556..d2eeb4140ff 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_tblout.c,v 1.7 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_tblout.c,v 1.8 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_tblout.c,v 1.3 1995/06/24 15:00:15 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -58,8 +58,8 @@ static char null_entry[] = "\n\t(char *(*)())0,\n\
 
 static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n";
 
-static void write_table __P((definition *));
-static void printit __P((char *, char *));
+static void write_table(definition *);
+static void printit(char *, char *);
 
 void
 write_tables()
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 4751e9e3c81..527590c07fc 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_util.c,v 1.7 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_util.c,v 1.8 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rpc_util.c,v 1.6 1995/08/29 23:05:57 cgd Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 
 #define ARGEXT "argument"
 
-static void printwhere __P((void));
+static void printwhere(void);
 
 char curline[MAXLINESIZE];	/* current read line */
 char *where = curline;		/* current point in line */
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 6d8b95e8c82..e1ad01fad29 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.8 2001/12/05 09:50:31 deraadt Exp $	*/
+/*	$OpenBSD: rpc_util.h,v 1.9 2002/02/16 21:27:51 millert 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
@@ -104,56 +104,56 @@ definition *findval();
 #define FINDVAL(list,item,finder) \
 	findval(list, item, finder)
 
-void crash __P((void));
-char *fixtype __P((char *));
-char *stringfix __P((char *));
-char *locase __P((char *));
-void pvname_svc __P((char *, char *));
-void pvname __P((char *, char *));
-void ptype __P((char *, char *, int));
-int isvectordef __P((char *, relation));
-int streq __P((char *, char *));
-void error __P((char *));
-void tabify __P((FILE *, int));
-void record_open __P((char *));
-bas_type *find_type __P((char *));
-char *make_argname __P((char *, char *));
+void crash(void);
+char *fixtype(char *);
+char *stringfix(char *);
+char *locase(char *);
+void pvname_svc(char *, char *);
+void pvname(char *, char *);
+void ptype(char *, char *, int);
+int isvectordef(char *, relation);
+int streq(char *, char *);
+void error(char *);
+void tabify(FILE *, int);
+void record_open(char *);
+bas_type *find_type(char *);
+char *make_argname(char *, char *);
 /*
  * rpc_cout routines 
  */
-void emit __P((definition *));
+void emit(definition *);
 
 /*
  * rpc_hout routines 
  */
-void print_datadef __P((definition *));
-void print_funcdef __P((definition *));
+void print_datadef(definition *);
+void print_funcdef(definition *);
 
 /*
  * rpc_svcout routines 
  */
-void write_most __P((char *, int, int));
-void write_rest __P((void));
-void write_programs __P((char *));
-void write_svc_aux __P((int));
-void write_inetd_register __P((char *));
-void write_netid_register __P((char *));
-void write_nettype_register __P((char *));
+void write_most(char *, int, int);
+void write_rest(void);
+void write_programs(char *);
+void write_svc_aux(int);
+void write_inetd_register(char *);
+void write_netid_register(char *);
+void write_nettype_register(char *);
 /*
  * rpc_clntout routines
  */
-void write_stubs __P((void));
-void printarglist __P((proc_list *, char *, char *));
+void write_stubs(void);
+void printarglist(proc_list *, char *, char *);
 
 
 /*
  * rpc_tblout routines
  */
-void write_tables __P((void));
+void write_tables(void);
 
 /*
  * rpc_sample routines
  */
-void write_sample_svc __P((definition *));
-int write_sample_clnt __P((definition *));
-void write_sample_clnt_main __P((void));
+void write_sample_svc(definition *);
+int write_sample_clnt(definition *);
+void write_sample_clnt_main(void);