10 files changed, 93 insertions, 89 deletions
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 48869dd..0378604 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -25,6 +25,8 @@
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
+ *
+ * $FreeBSD$
  */
 
 #ident	"@(#)rpc_clntout.c	1.15	94/04/25 SMI"
@@ -43,10 +45,10 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-extern void pdeclaration __P(( char *, declaration *, int, char * ));
-void printarglist __P(( proc_list *, char *, char *, char *));
-static void write_program __P(( definition * ));
-static void printbody __P(( proc_list * ));
+extern void pdeclaration( char *, declaration *, int, char * );
+void printarglist( proc_list *, char *, char *, char *);
+static void write_program( definition * );
+static void printbody( proc_list * );
 
 static char RESULT[] = "clnt_res";
 
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index cf78304..a9d19e9 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -48,16 +48,16 @@ static const char rcsid[] =
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-static void print_header __P(( definition * ));
-static void print_trailer __P(( void ));
-static void print_stat __P(( int , declaration * ));
-static void emit_enum __P(( definition * ));
-static void emit_program __P(( definition * ));
-static void emit_union __P(( definition * ));
-static void emit_struct __P(( definition * ));
-static void emit_typedef __P(( definition * ));
-static void emit_inline __P(( int, declaration *, int ));
-static void emit_single_in_line __P(( int, declaration *, int, relation ));
+static void print_header( definition * );
+static void print_trailer( void );
+static void print_stat( int , declaration * );
+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 emit_inline( int, declaration *, int );
+static void emit_single_in_line( int, declaration *, int, relation );
 
 /*
  * Emit the C-routine for the given definition
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 6a12663..e5d5647 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -43,19 +43,19 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
-void storexdrfuncdecl __P(( char *, int ));
-static void pconstdef __P(( definition * ));
-static void pstructdef __P(( definition * ));
-static void puniondef __P(( definition * ));
-static void pprogramdef __P(( definition * ));
-static void pstructdef __P(( definition * ));
-static void penumdef __P(( definition * ));
-static void ptypedef __P(( definition * ));
-static void pdefine __P(( char *, char * ));
-static int undefined2 __P(( char *, char * ));
-static void parglist __P(( proc_list *, char * ));
-static void pprocdef __P(( proc_list *, version_list *, char *, int, int ));
-void pdeclaration __P(( char *, declaration *, int, char * ));
+void storexdrfuncdecl( char *, int );
+static void pconstdef( definition * );
+static void pstructdef( definition * );
+static void puniondef( definition * );
+static void pprogramdef( definition * );
+static void pstructdef( definition * );
+static void penumdef( definition * );
+static void ptypedef( definition * );
+static void pdefine( char *, char * );
+static int undefined2( char *, char * );
+static void parglist( proc_list *, char * );
+static void pprocdef( proc_list *, version_list *, char *, int, int );
+void pdeclaration( char *, declaration *, int, char * );
 
 static char RESULT[] = "clnt_res";
 
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 30eb21c..cc3b47b 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -56,29 +56,29 @@ static const char rcsid[] =
 #include "rpc_util.h"
 #include "rpc_scan.h"
 
-extern void write_sample_svc __P(( definition * ));
-extern int write_sample_clnt __P(( definition * ));
-extern void write_sample_clnt_main __P(( void ));
-extern void add_sample_msg __P(( void ));
-static void c_output __P(( char *, char *, int, char * ));
-static void h_output __P(( char *, char *, int, char * ));
-static void l_output __P(( char *, char *, int, char * ));
-static void t_output __P(( char *, char *, int, char * ));
-static void clnt_output __P(( char *, char *, int, char * ));
-
-void c_initialize __P(( void ));
+extern void write_sample_svc( definition * );
+extern int write_sample_clnt( definition * );
+extern void write_sample_clnt_main( void );
+extern void add_sample_msg( void );
+static void c_output( char *, char *, int, char * );
+static void h_output( char *, char *, int, char * );
+static void l_output( char *, char *, int, char * );
+static void t_output( char *, char *, int, char * );
+static void clnt_output( char *, char *, int, char * );
+
+void c_initialize( void );
 
 #if !defined(__FreeBSD__) && !defined(__NetBSD__)
 char * rindex();
 #endif
 
-static void usage __P(( void ));
-static void options_usage __P (( void ));
-static int do_registers __P(( int, char ** ));
-static int parseargs __P(( int, char **, struct commandline * ));
-static void svc_output __P(( char *, char *, int, char * ));
-static void mkfile_output __P(( struct commandline * ));
-static void s_output __P(( int, char **, char *, char *, int, char *, int, int ));
+static void usage(void);
+static void options_usage(void);
+static int do_registers(int, char **);
+static int parseargs(int, char **, struct commandline *);
+static void svc_output(char *, char *, int, char *);
+static void mkfile_output(struct commandline *);
+static void s_output(int, char **, char *, char *, int, char *, int, int);
 
 #define	EXTEND	1		/* alias for TRUE */
 #define	DONT_EXTEND	0		/* alias for FALSE */
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index a4a44c8..0190dd9 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -47,18 +47,18 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 
 #define ARGNAME "arg"
 
-extern char *make_argname __P(( char *, char * ));
-static void isdefined __P(( definition * ));
-static void def_struct __P(( definition * ));
-static void def_program __P(( definition * ));
-static void def_enum __P(( definition * ));
-static void def_const __P(( definition * ));
-static void def_union __P(( definition * ));
-static void def_typedef __P(( definition * ));
-static void get_declaration __P(( declaration *, defkind ));
-static void get_prog_declaration __P(( declaration *, defkind, int ));
-static void get_type __P(( char **, char **, defkind ));
-static void unsigned_dec __P(( char ** ));
+extern char *make_argname( char *, char * );
+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 def_typedef( definition * );
+static void get_declaration( declaration *, defkind );
+static void get_prog_declaration( declaration *, defkind, int );
+static void get_type( char **, char **, defkind );
+static void unsigned_dec( char ** );
 
 #ifndef __FreeBSD__
 extern char *strdup();
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index e4f045f..d20348e 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -25,6 +25,8 @@
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
+ *
+ * $FreeBSD$
  */
 
 #pragma ident	"@(#)rpc_sample.c	1.9	94/04/25 SMI" 
@@ -42,10 +44,10 @@
 
 static char RQSTP[] = "rqstp";
 
-extern void printarglist __P(( proc_list *, char *, char *, char *));
-static void write_sample_client __P(( char *, version_list * ));
-static void write_sample_server __P(( definition * ));
-static void return_type __P(( proc_list * ));
+extern void printarglist( proc_list *, char *, char *, char *);
+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 140c608..5d4ce16 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -56,15 +56,15 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
 static int pushed = 0;	/* is a token pushed */
 static token lasttok;	/* last token, if pushed */
 
-static void unget_token __P(( token * ));
-static void findstrconst __P(( char **, char **));
-static void findchrconst __P(( char **, char **));
-static void findconst __P(( char **, char **));
-static void findkind __P(( char **, token * ));
-static int cppline __P(( char * ));
-static int directive __P(( char * ));
-static void printdirective __P(( char * ));
-static void docppline __P(( char *, int *, char ** ));
+static void unget_token( token * );
+static void findstrconst( char **, char **);
+static void findchrconst( char **, char **);
+static void findconst( char **, char **);
+static void findkind( char **, token * );
+static int cppline( char * );
+static int directive( char * );
+static void printdirective( char * );
+static void docppline( char *, int *, char ** );
 
 /*
  * scan expecting 1 given token 
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index fd48ee7..20f6aaf 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -55,21 +55,21 @@ static char RETVAL[] = "retval";
 
 char _errbuf[256];	/* For all messages */
 
-void internal_proctype __P(( proc_list * ));
-static void write_real_program __P(( definition * ));
-static void write_program __P(( definition *, char * ));
-static void printerr __P(( char *, char * ));
-static void printif __P(( char *, char *, char *, char * ));
-static void write_inetmost __P(( char * ));
-static void print_return __P(( char * ));
-static void print_pmapunset __P(( char * ));
-static void print_err_message __P(( char * ));
-static void write_timeout_func __P(( void ));
-static void write_pm_most __P(( char *, int ));
-static void write_rpc_svc_fg __P(( char *, char * ));
-static void open_log_file __P(( char *, char * ));
-static void write_msg_out __P(( void ));
-int nullproc __P(( proc_list * ));
+void internal_proctype( proc_list * );
+static void write_real_program( definition * );
+static void write_program( definition *, char * );
+static void printerr( char *, char * );
+static void printif( char *, char *, char *, char * );
+static void write_inetmost( char * );
+static void print_return( char * );
+static void print_pmapunset( char * );
+static void print_err_message( char * );
+static void write_timeout_func( void );
+static void write_pm_most( char *, int );
+static void write_rpc_svc_fg( char *, char * );
+static void open_log_file( char *, char * );
+static void write_msg_out( void );
+int nullproc( proc_list * );
 
 
 static void
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 45282c8..9488f76 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -63,9 +63,9 @@ 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";
 
-extern int nullproc __P(( proc_list * ));
-static void write_table __P(( definition * ));
-static void printit __P(( char *, char * ));
+extern int nullproc( proc_list * );
+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 75583a5..939ddaf 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -67,7 +67,7 @@ FILE *fin;			/* file pointer of current input */
 
 list *defined;			/* list of defined things */
 
-static void printwhere __P(( void ));
+static void printwhere( void );
 
 /*
  * Reinitialize the world