From 631b873cd893c4e484611f4d56f2dcc50a1a1ee4 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Thu, 15 Aug 2019 16:09:27 +0000 Subject: [PATCH] ping6: fix uninitialized variable warning for intvl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC isn't smart enough to realize that this variable was always initialized. Submitted by: Ján Sučan MFC after: 2 weeks Sponsored by: Google, inc. (Google Summer of Code 2019) Differential Revision: https://reviews.freebsd.org/D21271 --- sbin/ping6/ping6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 5315ddfdd1fa..42b223bb24bb 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -333,6 +333,9 @@ main(int argc, char *argv[]) memset(&smsghdr, 0, sizeof(smsghdr)); memset(&smsgiov, 0, sizeof(smsgiov)); + intvl.tv_sec = interval / 1000; + intvl.tv_nsec = interval % 1000 * 1000000; + alarmtimeout = preload = 0; datap = &outpack[ICMP6ECHOLEN + ICMP6ECHOTMLEN]; capdns = capdns_setup(); @@ -1121,9 +1124,6 @@ main(int argc, char *argv[]) if (options & F_FLOOD) { intvl.tv_sec = 0; intvl.tv_nsec = 10000000; - } else if ((options & F_INTERVAL) == 0) { - intvl.tv_sec = interval / 1000; - intvl.tv_nsec = interval % 1000 * 1000000; } almost_done = 0;