o __P removal

o use new style prototypes and function definitions
o signal handlers need an argument.  Mark it unused.

2 files changed, 11 insertions, 23 deletions

diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 4042217..69380c9 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -98,7 +98,7 @@ Display *dpy;
 static jmp_buf openAbort;
 
 static void
-abortOpen ()
+abortOpen(void)
 {
     longjmp (openAbort, 1);
 }
@@ -237,7 +237,7 @@ do_names_2(int all)
 }
 
 int *
-rusers_num()
+rusers_num(void)
 {
         static int num_users = 0;
 	struct utmp usr;
@@ -287,41 +287,31 @@ do_names_1(int all)
 }
 
 utmpidlearr *
-rusersproc_names_2_svc(argp, rqstp)
-	void			*argp;
-	struct svc_req		*rqstp;
+rusersproc_names_2_svc(void *argp, struct svc_req *rqstp)
 {
         return(do_names_2(0));
 }
 
 utmpidlearr *
-rusersproc_allnames_2_svc(argp, rqstp)
-	void			*argp;
-	struct svc_req		*rqstp;
+rusersproc_allnames_2_svc(void *argp, struct svc_req *rqstp)
 {
         return(do_names_2(1));
 }
 
 utmparr *
-rusersproc_names_1_svc(argp, rqstp)
-	void			*argp;
-	struct svc_req		*rqstp;
+rusersproc_names_1_svc(void *argp, struct svc_req *rqstp)
 {
-        return(do_names_1(0));
+	return(do_names_1(0));
 }
 
 utmparr *
-rusersproc_allnames_1_svc(argp, rqstp)
-	void			*argp;
-	struct svc_req		*rqstp;
+rusersproc_allnames_1_svc(void *argp, struct svc_req *rqstp)
 {
         return(do_names_1(1));
 }
 
 void
-rusers_service(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
+rusers_service(struct svc_req *rqstp, SVCXPRT *transp)
 {
 	union {
 		int fill;
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 9482692..fc4640f 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -45,12 +45,12 @@ static const char rcsid[] =
 #include <rpcsvc/rnusers.h>
 #undef utmp
 
-extern void rusers_service();
+extern void rusers_service(struct svc_req *, SVCXPRT *);
 
 int from_inetd = 1;
 
 void
-cleanup()
+cleanup(int sig __unused)
 {
         (void) pmap_unset(RUSERSPROG, RUSERSVERS_IDLE);
         (void) pmap_unset(RUSERSPROG, RUSERSVERS_ORIG);
@@ -58,9 +58,7 @@ cleanup()
 }
 
 int
-main(argc, argv)
-        int argc;
-        char *argv[];
+main(int argc, char *argv[])
 {
 	SVCXPRT *transp;
         int sock = 0;