Clean up more warnings.

Add -Wall -Wstrict-prototypes and clean up associated
warnings.

diff --git a/Makefile b/Makefile
index 3ef417ea119dcb90215be39e8da5f3650f43e8aa..c6a7a784085a581543fadaa139cfe21a2e7bd7f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ SHELL = /bin/sh
 COPT   = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \
        $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
        $(LOOPBACK) $(SETPGRP)
-CFLAGS = $(COPT) -O $(NSARCHS)
+CFLAGS = $(COPT) -O $(NSARCHS) -Wall -Wstrict-prototypes
 OBJECTS        = portmap.o pmap_check.o from_local.o
 
 all:   portmap pmap_dump pmap_set

diff --git a/from_local.c b/from_local.c
index ace273e968dd11a88481b07b2fe070f07dc7b63b..cd75e6a465d9b353cbda54a114794223e19b5a66 100644 (file)
--- a/from_local.c
+++ b/from_local.c
@@ -36,7 +36,8 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#) from_local.c 1.3 96/05/31 15:52:57";
+static __attribute__((__used__)) char
+sccsid[] = "@(#) from_local.c 1.3 96/05/31 15:52:57";
 #endif
 
 #include <sys/types.h>
@@ -67,7 +68,7 @@ static struct in_addr *addrs;
 
 /* grow_addrs - extend list of local interface addresses */
 
-static int grow_addrs()
+static int grow_addrs(void)
 {
     struct in_addr *new_addrs;
     int     new_num;
@@ -95,7 +96,8 @@ static int grow_addrs()
 
 /* find_local - find all IP addresses for this host */
 
-find_local()
+static int
+find_local(void)
 {
     struct ifconf ifc;
     struct ifreq ifreq;
@@ -153,8 +155,7 @@ find_local()
 
 /* from_local - determine whether request comes from the local system */
 
-from_local(addr)
-struct sockaddr_in *addr;
+int from_local(struct sockaddr_in *addr)
 {
     int     i;
 

diff --git a/pmap_check.c b/pmap_check.c
index 265d347671980efe53e82a578c6aa57b1a2d4d23..b716be4c8e704517a61f10f1fc9c9b52140939b5 100644 (file)
--- a/pmap_check.c
+++ b/pmap_check.c
@@ -33,9 +33,12 @@
   */
 
 #ifndef lint
-static char sccsid[] = "@(#) pmap_check.c 1.8 96/07/07 10:49:10";
+static __attribute__((__used__)) char
+sccsid[] = "@(#) pmap_check.c 1.8 96/07/07 10:49:10";
 #endif
 
+#include <sys/types.h>
+#include <unistd.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <syslog.h>
@@ -45,8 +48,8 @@ static char sccsid[] = "@(#) pmap_check.c 1.8 96/07/07 10:49:10";
 #include <netinet/in.h>
 #include <rpc/rpcent.h>
 #endif
-
-extern char *inet_ntoa();
+#include <tcpd.h>
+#include <arpa/inet.h>
 
 #include "pmap_check.h"
 
@@ -60,8 +63,9 @@ extern char *inet_ntoa();
 #define MOUNTPROC_MNT  ((u_long) 1)
 #define NFS_PORT       2049
 
-static void logit();
-static void toggle_verboselog();
+static void logit(int severity, struct sockaddr_in *addr,
+                 u_long procnum, u_long prognum, char *text);
+static void toggle_verboselog(int sig);
 int     verboselog = 0;
 int     allow_severity = LOG_INFO;
 int     deny_severity = LOG_WARNING;
@@ -94,7 +98,7 @@ int     deny_severity = LOG_WARNING;
 
 /* check_startup - additional startup code */
 
-void    check_startup()
+void check_startup(void)
 {
 
     /*
@@ -110,10 +114,9 @@ void    check_startup()
 
 /* check_default - additional checks for NULL, DUMP, GETPORT and unknown */
 
-check_default(addr, proc, prog)
-struct sockaddr_in *addr;
-u_long  proc;
-u_long  prog;
+int
+check_default(struct sockaddr_in *addr, u_long  proc,
+             u_long  prog)
 {
 #ifdef HOSTS_ACCESS
     if (!(from_local(addr) || good_client(addr))) {
@@ -128,11 +131,9 @@ u_long  prog;
 
 /* check_privileged_port - additional checks for privileged-port updates */
 
-check_privileged_port(addr, proc, prog, port)
-struct sockaddr_in *addr;
-u_long  proc;
-u_long  prog;
-u_long  port;
+int
+check_privileged_port(struct sockaddr_in *addr, u_long  proc,
+                     u_long  prog, u_long  port)
 {
 #ifdef CHECK_PORT
     if (!legal_port(addr, port)) {
@@ -147,13 +148,9 @@ u_long  port;
 
 #ifdef LOOPBACK_SETUNSET
 
-check_setunset(xprt, ludp_xprt, ltcp_xprt, proc, prog, port)
-SVCXPRT *xprt;
-SVCXPRT *ludp_xprt;
-SVCXPRT *ltcp_xprt;
-u_long  proc;
-u_long  prog;
-u_long  port;
+int
+check_setunset(SVCXPRT *xprt, SVCXPRT *ludp_xprt, SVCXPRT *ltcp_xprt,
+              u_long  proc, u_long  prog, u_long  port)
 {
     struct sockaddr_in *addr = svc_getcaller(xprt);
 
@@ -173,11 +170,9 @@ u_long  port;
 
 #else
 
-check_setunset(addr, proc, prog, port)
-struct sockaddr_in *addr;
-u_long  proc;
-u_long  prog;
-u_long  port;
+int
+check_setunset(struct sockaddr_in *addr, u_long  proc,
+              u_long  prog, u_long  port)
 {
     if (!from_local(addr)) {
 #ifdef HOSTS_ACCESS
@@ -197,11 +192,9 @@ u_long  port;
 
 /* check_callit - additional checks for forwarded requests */
 
-check_callit(addr, proc, prog, aproc)
-struct sockaddr_in *addr;
-u_long  proc;
-u_long  prog;
-u_long  aproc;
+int
+check_callit(struct sockaddr_in *addr, u_long  proc,
+            u_long  prog, u_long  aproc)
 {
 #ifdef HOSTS_ACCESS
     if (!(from_local(addr) || good_client(addr))) {
@@ -222,8 +215,7 @@ u_long  aproc;
 
 /* toggle_verboselog - toggle verbose logging flag */
 
-static void toggle_verboselog(sig)
-int     sig;
+static void toggle_verboselog(int sig)
 {
     (void) signal(sig, toggle_verboselog);
     verboselog = !verboselog;
@@ -231,12 +223,8 @@ int     sig;
 
 /* logit - report events of interest via the syslog daemon */
 
-static void logit(severity, addr, procnum, prognum, text)
-int     severity;
-struct sockaddr_in *addr;
-u_long  procnum;
-u_long  prognum;
-char   *text;
+static void logit(int severity, struct sockaddr_in *addr,
+                 u_long procnum, u_long prognum, char *text)
 {
     char   *procname;
     char    procbuf[4 * sizeof(u_long)];
@@ -249,13 +237,13 @@ char   *text;
     };
     struct proc_map *procp;
     static struct proc_map procmap[] = {
-       PMAPPROC_CALLIT, "callit",
-       PMAPPROC_DUMP, "dump",
-       PMAPPROC_GETPORT, "getport",
-       PMAPPROC_NULL, "null",
-       PMAPPROC_SET, "set",
-       PMAPPROC_UNSET, "unset",
-       0, 0,
+       { PMAPPROC_CALLIT, "callit" },
+       { PMAPPROC_DUMP, "dump"} ,
+       { PMAPPROC_GETPORT, "getport"} ,
+       { PMAPPROC_NULL, "null"} ,
+       { PMAPPROC_SET, "set"} ,
+       { PMAPPROC_UNSET, "unset"} ,
+       { 0, 0} ,
     };
 
     /*
@@ -269,7 +257,7 @@ char   *text;
 
        if (prognum == 0) {
            progname = "";
-       } else if (rpc = getrpcbynumber((int) prognum)) {
+       } else if ((rpc = getrpcbynumber((int) prognum))) {
            progname = rpc->r_name;
        } else {
            sprintf(progname = progbuf, "%lu", prognum);

diff --git a/pmap_check.h b/pmap_check.h
index 2a08b615a0b5e1e566357588195409f0038fd987..3a00b217a23eedec3c464c658440b3a7f529f705 100644 (file)
--- a/pmap_check.h
+++ b/pmap_check.h
@@ -1,11 +1,23 @@
 /* @(#) pmap_check.h 1.4 96/07/06 23:06:22 */
 
-extern int from_local();
-extern void check_startup();
-extern int check_default();
-extern int check_setunset();
-extern int check_privileged_port();
-extern int check_callit();
+extern int from_local(struct sockaddr_in *addr);
+extern void check_startup(void);
+extern int check_default(struct sockaddr_in *addr,
+                        u_long  proc, u_long  prog);
+#ifdef LOOPBACK_SETUNSET
+extern int
+check_setunset(SVCXPRT *xprt, SVCXPRT *ludp_xprt, SVCXPRT *ltcp_xprt,
+              u_long  proc, u_long  prog, u_long  port);
+#else
+extern int
+check_setunset(struct sockaddr_in *addr, u_long  proc,
+              u_long  prog, u_long  port);
+#endif
+extern int check_privileged_port(struct sockaddr_in *addr,
+                                u_long  proc,
+                                u_long  prog, u_long  port);
+extern int check_callit(struct sockaddr_in *addr, u_long  proc,
+                       u_long  prog, u_long  aproc);
 extern int verboselog;
 extern int allow_severity;
 extern int deny_severity;

diff --git a/pmap_dump.c b/pmap_dump.c
index 3d7359287f1e3cbd61617027c843180cf7f5c5cc..fc2b7cad9b54c25abe8645455560e3c547c9758f 100644 (file)
--- a/pmap_dump.c
+++ b/pmap_dump.c
@@ -6,7 +6,8 @@
   */
 
 #ifndef lint
-static char sccsid[] = "@(#) pmap_dump.c 1.1 92/06/11 22:53:15";
+static __attribute__((__used__)) char
+sccsid[] = "@(#) pmap_dump.c 1.1 92/06/11 22:53:15";
 #endif
 
 #include <stdio.h>
@@ -21,11 +22,10 @@ static char sccsid[] = "@(#) pmap_dump.c 1.1 92/06/11 22:53:15";
 #include <rpc/pmap_clnt.h>
 #include <rpc/pmap_prot.h>
 
-static char *protoname();
+static char *protoname(u_long proto);
 
-main(argc, argv)
-int     argc;
-char  **argv;
+int
+main(int argc, char **argv)
 {
     struct sockaddr_in addr;
     register struct pmaplist *list;
@@ -45,8 +45,7 @@ char  **argv;
     return (fclose(stdout) ? (perror(argv[0]), 1) : 0);
 }
 
-static char *protoname(proto)
-u_long  proto;
+static char *protoname(u_long proto)
 {
     static char buf[BUFSIZ];
 

diff --git a/pmap_set.c b/pmap_set.c
index bde07cb9d7658d51b3bff3a45771511b7c3480c2..697735af2f60f3971c780a47c91deecd5c67c1e8 100644 (file)
--- a/pmap_set.c
+++ b/pmap_set.c
@@ -6,7 +6,8 @@
   */
 
 #ifndef lint
-static char sccsid[] = "@(#) pmap_set.c 1.2 96/07/06 23:06:23";
+static __attribute__((__used__)) char
+sccsid[] = "@(#) pmap_set.c 1.2 96/07/06 23:06:23";
 #endif
 
 #include <stdio.h>
@@ -17,9 +18,12 @@ static char sccsid[] = "@(#) pmap_set.c 1.2 96/07/06 23:06:23";
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
 
-main(argc, argv)
-int     argc;
-char  **argv;
+static int
+parse_line(char *buf, u_long *prog, u_long *vers,
+          int *prot, unsigned *port);
+
+int
+main(int argc, char **argv)
 {
     char    buf[BUFSIZ];
     u_long  prog;
@@ -40,12 +44,9 @@ char  **argv;
 
 /* parse_line - convert line to numbers */
 
-parse_line(buf, prog, vers, prot, port)
-char   *buf;
-u_long *prog;
-u_long *vers;
-int    *prot;
-unsigned *port;
+static int
+parse_line(char *buf, u_long *prog, u_long *vers,
+          int *prot, unsigned *port)
 {
     char    proto_name[BUFSIZ];
 

diff --git a/portmap.c b/portmap.c
index e102da1337ac1f5d9284ba87b805e23ef07d349a..303664267f9b7734bfa6d702ad35496f86565826 100644 (file)
--- a/portmap.c
+++ b/portmap.c
@@ -38,7 +38,8 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#) portmap.c 1.6 96/07/06 23:06:23";
+static __attribute__((__used__)) char
+sccsid[] = "@(#) portmap.c 1.6 96/07/06 23:06:23";
 #endif /* not lint */
 
 /*
@@ -98,7 +99,6 @@ static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro";
 #include <netinet/in.h>
 #endif
 
-extern char *strerror();
 #include <stdlib.h>
 
 #ifndef LOG_PERROR
@@ -122,12 +122,11 @@ extern char *strerror();
 #define setsid() setpgrp(0,0)
 #endif
 
-void reg_service();
-void reap();
-static void callit();
+static void reg_service(struct svc_req *rqstp, SVCXPRT *xprt);
+static void reap(int);
+static void callit(struct svc_req *rqstp, SVCXPRT *xprt);
 struct pmaplist *pmaplist;
 int debugging = 0;
-extern int errno;
 
 #include "pmap_check.h"
 
@@ -151,9 +150,8 @@ static int on = 1;
 #endif
 #endif
 
-main(argc, argv)
-       int argc;
-       char **argv;
+int
+main(int argc, char **argv)
 {
        SVCXPRT *xprt;
        int sock, c;
@@ -302,8 +300,7 @@ void perror(const char *what)
 }
 
 static struct pmaplist *
-find_service(prog, vers, prot)
-       u_long prog, vers, prot;
+find_service(u_long prog, u_long vers, u_long prot)
 {
        register struct pmaplist *hit = NULL;
        register struct pmaplist *pml;
@@ -322,10 +319,7 @@ find_service(prog, vers, prot)
 /* 
  * 1 OK, 0 not
  */
-void
-reg_service(rqstp, xprt)
-       struct svc_req *rqstp;
-       SVCXPRT *xprt;
+static void reg_service(struct svc_req *rqstp, SVCXPRT *xprt)
 {
        struct pmap reg;
        struct pmaplist *pml, *prevpml, *fnd;
@@ -539,9 +533,7 @@ struct encap_parms {
 };
 
 static bool_t
-xdr_encap_parms(xdrs, epp)
-       XDR *xdrs;
-       struct encap_parms *epp;
+xdr_encap_parms(XDR *xdrs, struct encap_parms *epp)
 {
 
        return (xdr_bytes(xdrs, &(epp->args), &(epp->arglen), ARGSIZE));
@@ -556,9 +548,7 @@ struct rmtcallargs {
 };
 
 static bool_t
-xdr_rmtcall_args(xdrs, cap)
-       register XDR *xdrs;
-       register struct rmtcallargs *cap;
+xdr_rmtcall_args(XDR *xdrs, struct rmtcallargs *cap)
 {
 
        /* does not get a port number */
@@ -571,9 +561,7 @@ xdr_rmtcall_args(xdrs, cap)
 }
 
 static bool_t
-xdr_rmtcall_result(xdrs, cap)
-       register XDR *xdrs;
-       register struct rmtcallargs *cap;
+xdr_rmtcall_result(XDR *xdrs, struct rmtcallargs *cap)
 {
        if (xdr_u_long(xdrs, &(cap->rmt_port)))
                return (xdr_encap_parms(xdrs, &(cap->rmt_args)));
@@ -585,9 +573,7 @@ xdr_rmtcall_result(xdrs, cap)
  * The arglen must already be set!!
  */
 static bool_t
-xdr_opaque_parms(xdrs, cap)
-       XDR *xdrs;
-       struct rmtcallargs *cap;
+xdr_opaque_parms(XDR *xdrs, struct rmtcallargs *cap)
 {
 
        return (xdr_opaque(xdrs, cap->rmt_args.args, cap->rmt_args.arglen));
@@ -598,9 +584,7 @@ xdr_opaque_parms(xdrs, cap)
  * and then calls xdr_opaque_parms.
  */
 static bool_t
-xdr_len_opaque_parms(xdrs, cap)
-       register XDR *xdrs;
-       struct rmtcallargs *cap;
+xdr_len_opaque_parms(register XDR *xdrs, struct rmtcallargs *cap)
 {
        register u_int beginpos, lowpos, highpos, currpos, pos;
 
@@ -630,10 +614,7 @@ xdr_len_opaque_parms(xdrs, cap)
  * This now forks so that the program & process that it calls can call 
  * back to the portmapper.
  */
-static void
-callit(rqstp, xprt)
-       struct svc_req *rqstp;
-       SVCXPRT *xprt;
+static void callit(struct svc_req *rqstp, SVCXPRT *xprt)
 {
        struct rmtcallargs a;
        struct pmaplist *pml;
@@ -690,8 +671,7 @@ callit(rqstp, xprt)
        exit(0);
 }
 
-void
-reap()
+static void reap(int ignore)
 {
        while (wait3((int *)NULL, WNOHANG, (struct rusage *)NULL) > 0);
 }