diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-05-26 13:22:41 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-05-26 13:22:41 +0000 |
| commit | a559655f9e30ca92710146b3762228c7069266be (patch) | |
| tree | 36453b59a095c7d72f784dd1a4677adc9d5a9eea /sbin/ping6 | |
| parent | a53b09aad6dbff9dc966ed2c935c4d8819477075 (diff) | |
KNF. remove unneeded variable. from deraadt
Diffstat (limited to 'sbin/ping6')
| -rw-r--r-- | sbin/ping6/ping6.8 | 4 | ||||
| -rw-r--r-- | sbin/ping6/ping6.c | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8 index 6bb9dbf4729..2c3928a847c 100644 --- a/sbin/ping6/ping6.8 +++ b/sbin/ping6/ping6.8 @@ -1,5 +1,5 @@ -.\" $OpenBSD: ping6.8,v 1.23 2002/05/26 13:14:23 deraadt Exp $ -.\" $KAME: ping6.8,v 1.56 2002/05/26 12:07:51 itojun Exp $ +.\" $OpenBSD: ping6.8,v 1.24 2002/05/26 13:22:40 itojun Exp $ +.\" $KAME: ping6.8,v 1.57 2002/05/26 13:18:25 itojun Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. .\" All rights reserved. diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index f3157a1163e..3508beadcb5 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ping6.c,v 1.44 2002/05/26 13:02:17 itojun Exp $ */ -/* $KAME: ping6.c,v 1.154 2002/05/26 12:56:34 itojun Exp $ */ +/* $OpenBSD: ping6.c,v 1.45 2002/05/26 13:22:40 itojun Exp $ */ +/* $KAME: ping6.c,v 1.155 2002/05/26 13:18:25 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -239,7 +239,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 @@ -1040,7 +1039,7 @@ main(argc, argv) if ((fdmaskp = malloc(fdmasks)) == NULL) err(1, "malloc"); - signo = seenalrm = seenint = 0; + seenalrm = seenint = 0; #ifdef SIGINFO seeninfo = 0; #endif @@ -1139,7 +1138,7 @@ void onsignal(sig) int sig; { - signo = sig; + switch (sig) { case SIGALRM: seenalrm++; @@ -1598,11 +1597,9 @@ pr_pack(buf, cc, mhdr) } else { i = 0; while (cp < end) { - if (dnsdecode((const u_char **)&cp, - end, - (const u_char *)(ni + 1), - dnsname, - sizeof(dnsname)) == NULL) { + if (dnsdecode((const u_char **)&cp, end, + (const u_char *)(ni + 1), dnsname, + sizeof(dnsname)) == NULL) { printf("???"); break; } |