Module Name: src
Committed By: christos
Date: Sat Oct 19 01:08:25 UTC 2013
Modified Files:
src/sbin/ping: ping.c
Log Message:
avoid bogus uninitialized gcc warning
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sbin/ping/ping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.106 src/sbin/ping/ping.c:1.107
--- src/sbin/ping/ping.c:1.106 Wed Mar 6 06:33:08 2013
+++ src/sbin/ping/ping.c Fri Oct 18 21:08:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.106 2013/03/06 11:33:08 yamt Exp $ */
+/* $NetBSD: ping.c,v 1.107 2013/10/19 01:08:25 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.106 2013/03/06 11:33:08 yamt Exp $");
+__RCSID("$NetBSD: ping.c,v 1.107 2013/10/19 01:08:25 christos Exp $");
#endif
#include <stdio.h>
@@ -1011,7 +1011,6 @@ pr_pack(u_char *buf,
icp = (struct icmp *)(buf + hlen);
if (icp->icmp_type == ICMP_ECHOREPLY
&& icp->icmp_id == ident) {
- struct timespec tv;
if (icp->icmp_seq == htons((u_int16_t)(ntransmitted-1)))
lastrcvd = 1;
@@ -1019,16 +1018,20 @@ pr_pack(u_char *buf,
if (first_rx.tv_sec == 0)
first_rx = last_rx;
nreceived++;
- if (pingflags & F_TIMING) {
- struct tv32 tv32;
+ if (pingflags & (F_TIMING|F_TIMING64)) {
+ struct timespec tv;
- (void) memcpy(&tv32, icp->icmp_data, sizeof(tv32));
- tv.tv_sec = (uint32_t)ntohl(tv32.tv32_sec);
- tv.tv_nsec = ntohl(tv32.tv32_usec) * 1000;
- } else if (pingflags & F_TIMING64)
- (void) memcpy(&tv, icp->icmp_data, sizeof(tv));
+ if (pingflags & F_TIMING) {
+ struct tv32 tv32;
+
+ (void)memcpy(&tv32, icp->icmp_data, sizeof(tv32));
+ tv.tv_sec = (uint32_t)ntohl(tv32.tv32_sec);
+ tv.tv_nsec = ntohl(tv32.tv32_usec) * 1000;
+ } else if (pingflags & F_TIMING64)
+ (void)memcpy(&tv, icp->icmp_data, sizeof(tv));
+ else
+ memset(&tv, 0, sizeof(tv)); /* XXX: gcc */
- if (pingflags & (F_TIMING|F_TIMING64)) {
triptime = diffsec(&last_rx, &tv);
tsum += triptime;
tsumsq += triptime * triptime;
