From 8a8f54cf28fbe1d04aa539e5a46b4cb9d71d6e33 Mon Sep 17 00:00:00 2001 From: alfred Date: Thu, 11 Jul 2002 17:55:14 +0000 Subject: make mostly WARNS=4 clean. constify, mark unsued args, fixup prototypes. --- usr.sbin/rpc.statd/Makefile | 3 +++ usr.sbin/rpc.statd/file.c | 2 +- usr.sbin/rpc.statd/procs.c | 8 ++++---- usr.sbin/rpc.statd/statd.c | 6 +++--- usr.sbin/rpc.statd/statd.h | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile index 0eedee5..713e83b 100644 --- a/usr.sbin/rpc.statd/Makefile +++ b/usr.sbin/rpc.statd/Makefile @@ -14,6 +14,9 @@ CLEANFILES= sm_inter_svc.c sm_inter.h RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x RPCGEN= rpcgen -L -C +WARNS=4 +NO_WERROR=1 + sm_inter_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} diff --git a/usr.sbin/rpc.statd/file.c b/usr.sbin/rpc.statd/file.c index 5733ce2..4c17e5d 100644 --- a/usr.sbin/rpc.statd/file.c +++ b/usr.sbin/rpc.statd/file.c @@ -137,7 +137,7 @@ HostInfo *find_host(char *hostname, int create) the state number to the next even value. */ -void init_file(char *filename) +void init_file(const char *filename) { int new_file = FALSE; char buf[HEADER_LEN]; diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c index 142040a..efd293c 100644 --- a/usr.sbin/rpc.statd/procs.c +++ b/usr.sbin/rpc.statd/procs.c @@ -240,7 +240,7 @@ static int do_unmon(HostInfo *hp, my_id *idp) earlier call to sm_mon_1 */ -struct sm_stat *sm_unmon_1_svc(mon_id *arg, struct svc_req *req) +struct sm_stat *sm_unmon_1_svc(mon_id *arg, struct svc_req *req __unused) { static sm_stat res; HostInfo *hp; @@ -278,7 +278,7 @@ struct sm_stat *sm_unmon_1_svc(mon_id *arg, struct svc_req *req) host and program number. */ -struct sm_stat *sm_unmon_all_1_svc(my_id *arg, struct svc_req *req) +struct sm_stat *sm_unmon_all_1_svc(my_id *arg, struct svc_req *req __unused) { static sm_stat res; HostInfo *hp; @@ -315,7 +315,7 @@ struct sm_stat *sm_unmon_all_1_svc(my_id *arg, struct svc_req *req) and inform all hosts on the monitor list. */ -void *sm_simu_crash_1_svc(void *v, struct svc_req *req) +void *sm_simu_crash_1_svc(void *v, struct svc_req *req __unused) { static char dummy; int work_to_do; @@ -359,7 +359,7 @@ void *sm_simu_crash_1_svc(void *v, struct svc_req *req) that modify the list. */ -void *sm_notify_1_svc(stat_chge *arg, struct svc_req *req) +void *sm_notify_1_svc(stat_chge *arg, struct svc_req *req __unused) { struct timeval timeout = { 20, 0 }; /* 20 secs timeout */ CLIENT *cli; diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c index 08ffbd0..b49a428 100644 --- a/usr.sbin/rpc.statd/statd.c +++ b/usr.sbin/rpc.statd/statd.c @@ -55,8 +55,8 @@ static const char rcsid[] = int debug = 0; /* Controls syslog() calls for debug messages */ extern void sm_prog_1(struct svc_req *rqstp, SVCXPRT *transp); -static void handle_sigchld(); -static void usage __P((void)); +static void handle_sigchld(int sig); +static void usage(void); int main(int argc, char **argv) @@ -126,7 +126,7 @@ usage() children to exit when they have done their work. */ -static void handle_sigchld(int sig, int code, struct sigcontext *scp) +static void handle_sigchld(int sig __unused) { int pid, status; pid = wait4(-1, &status, WNOHANG, (struct rusage*)0); diff --git a/usr.sbin/rpc.statd/statd.h b/usr.sbin/rpc.statd/statd.h index b3c5d41..a82d760 100644 --- a/usr.sbin/rpc.statd/statd.h +++ b/usr.sbin/rpc.statd/statd.h @@ -105,7 +105,7 @@ extern int debug; /* =1 to enable diagnostics to syslog */ /* Function prototypes */ extern HostInfo *find_host(char * /*hostname*/, int /*create*/); -extern void init_file(char * /*filename*/); +extern void init_file(const char * /*filename*/); extern void notify_hosts(void); extern void sync_file(void); extern int sm_check_hostname(struct svc_req *req, char *arg); -- cgit v1.1