summaryrefslogtreecommitdiffstats
path: root/usr.sbin/rpc.lockd/lockd.c
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2001-11-13 11:24:23 +0000
committeralfred <alfred@FreeBSD.org>2001-11-13 11:24:23 +0000
commit286faba5487469ccabb21c244ccd470ad5d111c9 (patch)
treebad9997dbd8a4ffafa0a78beb8020cb932ee73ef /usr.sbin/rpc.lockd/lockd.c
parentae8c4c565e16ab2948916667f1a33417b33f49d9 (diff)
downloadFreeBSD-src-286faba5487469ccabb21c244ccd470ad5d111c9.zip
FreeBSD-src-286faba5487469ccabb21c244ccd470ad5d111c9.tar.gz
Turn on NO_WERROR and set WARNS to 1.
Fix the WARNS 1 warnings except unused variables. Add prototype for log_netobj(). Don't compare signed/unsigned. Cast u_int64_t to 'unsigned long long' and print using %llu. Fix constness of string arrays. Use a cast to avoid an unused parameter in a signal handler. alarm(2) can't fail, so don't check for it. ANSI'ify some functions.
Diffstat (limited to 'usr.sbin/rpc.lockd/lockd.c')
-rw-r--r--usr.sbin/rpc.lockd/lockd.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index cd08f55..0397514 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -82,9 +82,9 @@ void nlm_prog_3 __P((struct svc_req *, SVCXPRT *));
void nlm_prog_4 __P((struct svc_req *, SVCXPRT *));
void usage __P((void));
-void sigalarm_handler __P((int));
+void sigalarm_handler __P((void));
-char *transports[] = { "udp", "tcp", "udp6", "tcp6" };
+const char *transports[] = { "udp", "tcp", "udp6", "tcp6" };
int
main(argc, argv)
@@ -196,7 +196,7 @@ main(argc, argv)
strerror(errno));
exit(1);
}
- sigalarm.sa_handler = sigalarm_handler;
+ sigalarm.sa_handler = (sig_t) sigalarm_handler;
sigemptyset(&sigalarm.sa_mask);
sigalarm.sa_flags = SA_RESETHAND; /* should only happen once */
sigalarm.sa_flags |= SA_RESTART;
@@ -206,11 +206,7 @@ main(argc, argv)
exit(1);
}
grace_expired = 0;
- if (alarm(10) < 0) {
- syslog(LOG_WARNING, "alarm failed: %s",
- strerror(errno));
- exit(1);
- }
+ alarm(10);
init_nsm();
@@ -221,9 +217,9 @@ main(argc, argv)
}
void
-sigalarm_handler(s)
- int s;
+sigalarm_handler(void)
{
+
grace_expired = 1;
}
OpenPOWER on IntegriCloud