diff options
| -rw-r--r-- | sbin/ping/ping.c | 4 | ||||
| -rw-r--r-- | sbin/ping6/ping6.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index ba334fbde72..0338a495593 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.156 2016/09/10 07:39:49 florian Exp $ */ +/* $OpenBSD: ping.c,v 1.157 2016/09/10 07:40:58 florian Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -193,13 +193,13 @@ main(int argc, char *argv[]) struct addrinfo hints, *res; struct itimerval itimer; struct sockaddr_in from, from4; + socklen_t maxsizelen; int64_t preload; int ch, i, optval = 1, packlen, maxsize, df = 0, tos = 0; int error; u_char *datap, *packet, ttl = MAXTTL, loop = 1; char *e, *target, hbuf[NI_MAXHOST], *source = NULL; char rspace[3 + 4 * NROUTES + 1]; /* record route space */ - socklen_t maxsizelen; const char *errstr; double intval; uid_t uid; diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index eb54d87f6dc..34a59ecae28 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping6.c,v 1.159 2016/09/10 07:31:43 florian Exp $ */ +/* $OpenBSD: ping6.c,v 1.160 2016/09/10 07:41:36 florian Exp $ */ /* $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */ /* @@ -226,16 +226,14 @@ void pr_retip(struct ip6_hdr *, u_char *); int main(int argc, char *argv[]) { - struct addrinfo *res; + struct addrinfo hints, *res; struct itimerval itimer; struct sockaddr_in6 from, from6; - struct addrinfo hints; + socklen_t maxsizelen; int64_t preload; int ch, i, maxsize, packlen, optval, error; - socklen_t maxsizelen; u_char *datap, *packet; - char *e, *target, hbuf[NI_MAXHOST]; - char *source = NULL; + char *e, *target, hbuf[NI_MAXHOST], *source = NULL; const char *errstr; struct cmsghdr *scmsg = NULL; struct in6_pktinfo *pktinfo = NULL; |