diff options
author | Neil Brown <neilb@suse.de> | 2007-07-29 17:20:10 +1000 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2007-07-29 17:20:10 +1000 |
commit | 5835b1eec5a1f1e463c0762c510c6643fa2bff62 (patch) | |
tree | 7a8b95c1b9b1273be2272a2dd9302265f9839e4d /support | |
parent | dd087896285da9e160e13ee9f7d75381b67895e3 (diff) | |
download | nfs-utils-5835b1eec5a1f1e463c0762c510c6643fa2bff62.tar.gz nfs-utils-5835b1eec5a1f1e463c0762c510c6643fa2bff62.tar.xz nfs-utils-5835b1eec5a1f1e463c0762c510c6643fa2bff62.zip |
Add -Wstrict-prototypes to compiler args, and fix warnings caused.
Diffstat (limited to 'support')
-rw-r--r-- | support/misc/from_local.c | 7 | ||||
-rw-r--r-- | support/misc/tcpwrapper.c | 25 | ||||
-rw-r--r-- | support/nfs/fstab.c | 4 | ||||
-rw-r--r-- | support/nfs/rpcmisc.c | 4 | ||||
-rw-r--r-- | support/nfs/wildmat.c | 8 |
5 files changed, 19 insertions, 29 deletions
diff --git a/support/misc/from_local.c b/support/misc/from_local.c index f6f944c..d987207 100644 --- a/support/misc/from_local.c +++ b/support/misc/from_local.c @@ -71,7 +71,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; @@ -99,7 +99,7 @@ static int grow_addrs() /* find_local - find all IP addresses for this host */ static int -find_local() +find_local(void) { struct ifconf ifc; struct ifreq ifreq; @@ -157,8 +157,7 @@ find_local() /* from_local - determine whether request comes from the local system */ int -from_local(addr) -struct sockaddr_in *addr; +from_local(struct sockaddr_in *addr) { int i; diff --git a/support/misc/tcpwrapper.c b/support/misc/tcpwrapper.c index ebe63e1..0cc9335 100644 --- a/support/misc/tcpwrapper.c +++ b/support/misc/tcpwrapper.c @@ -49,8 +49,9 @@ #include <rpc/rpcent.h> #endif -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; @@ -139,7 +140,7 @@ struct sockaddr_in *addr; /* check_startup - additional startup code */ -void check_startup() +void check_startup(void) { /* @@ -194,11 +195,8 @@ u_long prog; /* check_privileged_port - additional checks for privileged-port updates */ int -check_privileged_port(addr, proc, prog, port) -struct sockaddr_in *addr; -u_long proc; -u_long prog; -u_long port; +check_privileged_port(struct sockaddr_in *addr, + u_long proc, u_long prog, u_long port) { #ifdef CHECK_PORT if (!legal_port(addr, port)) { @@ -211,8 +209,7 @@ u_long port; /* 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; @@ -220,12 +217,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[16 + 4 * sizeof(u_long)]; diff --git a/support/nfs/fstab.c b/support/nfs/fstab.c index aee8e53..b4f8710 100644 --- a/support/nfs/fstab.c +++ b/support/nfs/fstab.c @@ -87,14 +87,14 @@ static void read_mounttable(void); static void read_fstab(void); static struct mntentchn * -mtab_head() { +mtab_head(void) { if (!got_mtab) read_mounttable(); return &mounttable; } static struct mntentchn * -fstab_head() +fstab_head(void) { if (!got_fstab) read_fstab(); diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c index 22ea62c..fcc6433 100644 --- a/support/nfs/rpcmisc.c +++ b/support/nfs/rpcmisc.c @@ -47,7 +47,9 @@ int _rpcfdtype = 0; int _rpcsvcdirty = 0; void -rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport) +rpc_init(char *name, int prog, int vers, + void (*dispatch)(struct svc_req *, register SVCXPRT *), + int defport) { struct sockaddr_in saddr; SVCXPRT *transp; diff --git a/support/nfs/wildmat.c b/support/nfs/wildmat.c index ba53b3a..c5b4c78 100644 --- a/support/nfs/wildmat.c +++ b/support/nfs/wildmat.c @@ -59,9 +59,7 @@ ** Match text and p, return TRUE, FALSE, or ABORT. */ static int -DoMatch(text, p) - register char *text; - register char *p; +DoMatch(char *text, char *p) { register int last; register int matched; @@ -126,9 +124,7 @@ DoMatch(text, p) ** User-level routine. Returns TRUE or FALSE. */ int -wildmat(text, p) - char *text; - char *p; +wildmat(char *text, char *p) { #ifdef OPTIMIZE_JUST_STAR if (p[0] == '*' && p[1] == '\0') |