summaryrefslogtreecommitdiff
path: root/sbin/ping6/ping6.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-11-17 19:54:58 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-11-17 19:54:58 +0000
commit3098cdb2aeca6d121a47df0401bd9d64682b3e9c (patch)
treecff90396a2f6df9ced0c2d1ac2cadc0c7877bc1c /sbin/ping6/ping6.c
parent5c3512bff36556eb83c2abecbf32b9ccdab08c9f (diff)
volatile sig_atomic_t
Diffstat (limited to 'sbin/ping6/ping6.c')
-rw-r--r--sbin/ping6/ping6.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index a0a828c9be2..405c2d9672f 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping6.c,v 1.38 2001/11/05 07:54:44 itojun Exp $ */
+/* $OpenBSD: ping6.c,v 1.39 2001/11/17 19:54:57 deraadt Exp $ */
/* $KAME: ping6.c,v 1.129 2001/06/22 13:16:02 itojun Exp $ */
/*
@@ -247,7 +247,6 @@ struct msghdr smsghdr;
struct iovec smsgiov;
char *scmsg = 0;
-volatile int signo;
volatile sig_atomic_t seenalrm;
volatile sig_atomic_t seenint;
#ifdef SIGINFO
@@ -999,7 +998,7 @@ main(argc, argv)
if ((fdmaskp = malloc(fdmasks)) == NULL)
err(1, "malloc");
- signo = seenalrm = seenint = 0;
+ seenalrm = seenint = 0;
#ifdef SIGINFO
seeninfo = 0;
#endif
@@ -1097,10 +1096,9 @@ main(argc, argv)
void
onsignal(sig)
- int sig;
+ int signo;
{
- signo = sig;
- switch (sig) {
+ switch (signo) {
case SIGALRM:
seenalrm++;
break;