[Git][NTPsec/ntpsec][master] 5 commits: Add some more trivial default cases to switches.
Gary E. Miller
gitlab at mg.gitlab.com
Fri Apr 14 02:19:14 UTC 2017
Gary E. Miller pushed to branch master at NTPsec / ntpsec
Commits:
8becd568 by Gary E. Miller at 2017-04-13T18:51:28-07:00
Add some more trivial default cases to switches.
- - - - -
1368224b by Gary E. Miller at 2017-04-13T19:01:13-07:00
Fix missing default in switch statements.
- - - - -
af273154 by Gary E. Miller at 2017-04-13T19:04:11-07:00
Add missing trivial default cases.
- - - - -
8b22acc0 by Gary E. Miller at 2017-04-13T19:10:02-07:00
Fix (almost) last missing default case issues.
Once again Bison has a bug, so -Wswitch-default can not be used
by default.
- - - - -
65c8b87f by Gary E. Miller at 2017-04-13T19:18:04-07:00
waf: Set -Wshadow, -Winit-self on by default if available.
- - - - -
12 changed files:
- libntp/ntp_intres.c
- libntp/socktoa.c
- libntp/statestr.c
- libparse/clk_meinberg.c
- libparse/clk_trimtsip.c
- libparse/parse.c
- ntpd/ntp_control.c
- ntpd/refclock_generic.c
- ntpd/refclock_modem.c
- ntpd/refclock_oncore.c
- ntpd/refclock_truetime.c
- wafhelpers/configure.py
Changes:
=====================================
libntp/ntp_intres.c
=====================================
--- a/libntp/ntp_intres.c
+++ b/libntp/ntp_intres.c
@@ -1041,6 +1041,9 @@ should_retry_dns(
# endif
break;
#endif
+ default:
+ /* huh? */
+ break;
}
TRACE(2, ("intres: resolver returned: %s (%d), %sretrying\n",
=====================================
libntp/socktoa.c
=====================================
--- a/libntp/socktoa.c
+++ b/libntp/socktoa.c
@@ -129,6 +129,9 @@ sock_hash(
pch = (const void *)&SOCK_ADDR6(addr);
len = sizeof(SOCK_ADDR6(addr));
break;
+ default:
+ /* huh? */
+ break;
}
for (u_int j = 0; j < len ; j++)
=====================================
libntp/statestr.c
=====================================
--- a/libntp/statestr.c
+++ b/libntp/statestr.c
@@ -443,6 +443,10 @@ statustoa(
getevents(CTL_SYS_NEVNT(st)),
getcode((st) & 0xf, clock_codes));
break;
+
+ default:
+ /* huh? */
+ break;
}
return cb;
=====================================
libparse/clk_meinberg.c
=====================================
--- a/libparse/clk_meinberg.c
+++ b/libparse/clk_meinberg.c
@@ -647,10 +647,11 @@ gps_input(
parseio->parse_index = 0;
return PARSE_INP_TIME;
}
- else
- {
- return PARSE_INP_SKIP;
- }
+ return PARSE_INP_SKIP;
+
+ default:
+ /* huh? */
+ break;
}
/* cnt == 0, so the header or the whole message is complete */
=====================================
libparse/clk_trimtsip.c
=====================================
--- a/libparse/clk_trimtsip.c
+++ b/libparse/clk_trimtsip.c
@@ -271,6 +271,9 @@ cvt_trimtsip(
case STATUS_BAD:
clock_time->flags |= PARSEB_NOSYNC|PARSEB_POWERUP;
break;
+ default:
+ /* huh? */
+ break;
}
if (t->t_mode == 0)
=====================================
libparse/parse.c
=====================================
--- a/libparse/parse.c
+++ b/libparse/parse.c
@@ -196,6 +196,10 @@ parse_ioread(
case PARSE_IO_CS8:
ch &= (char) 0xFFU;
break;
+
+ default:
+ /* huh? */
+ break;
}
parseprintf(DD_PARSE, ("parse_ioread(0x%lx, char=0x%x, ..., ...)\n",
=====================================
ntpd/ntp_control.c
=====================================
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -2033,6 +2033,9 @@ ctl_putsys(
/* a.k.a. sys_tick (s), output in ms */
ctl_putdbl6(sys_var[varid].text, sys_tick * MS_PER_S);
break;
+ default:
+ /* huh? */
+ break;
}
}
@@ -2479,6 +2482,10 @@ ctl_putclock(
*s = '\0';
ctl_putdata(buf, (unsigned)(s - buf), false);
break;
+
+ default:
+ /* huh? */
+ break;
}
}
#endif
@@ -3219,6 +3226,10 @@ send_mru_entry(
snprintf(tag, sizeof(tag), rs_fmt, count);
ctl_puthex(tag, mon->flags);
break;
+
+ default:
+ /* huh? */
+ break;
}
sent[which] = true;
remaining--;
@@ -3727,6 +3738,10 @@ send_ifstats_entry(
snprintf(tag, sizeof(tag), up_fmt, ifnum);
ctl_putuint(tag, current_time - la->starttime);
break;
+
+ default:
+ /* huh? */
+ break;
}
sent[which] = true;
remaining--;
@@ -3877,6 +3892,10 @@ send_restrict_entry(
}
ctl_putunqstr(tag, pch, strlen(pch));
break;
+
+ default:
+ /* huh? */
+ break;
}
sent[which] = true;
remaining--;
=====================================
ntpd/refclock_generic.c
=====================================
--- a/ntpd/refclock_generic.c
+++ b/ntpd/refclock_generic.c
@@ -2779,6 +2779,10 @@ parse_start(
case CS8:
tmp_ctl.parsesetcs.parse_cs = PARSE_IO_CS8;
break;
+
+ default:
+ /* huh? */
+ break;
}
if (!PARSE_SETCS(parse, &tmp_ctl))
@@ -3311,20 +3315,23 @@ parse_process(
{
parse_event(parse, CEVNT_BADREPLY);
}
+ else if (parsetime->parse_status & CVT_BADDATE)
+ {
+ parse_event(parse, CEVNT_BADDATE);
+ }
+ else if (parsetime->parse_status & CVT_BADTIME)
+ {
+ parse_event(parse, CEVNT_BADTIME);
+ }
else
- if (parsetime->parse_status & CVT_BADDATE)
- {
- parse_event(parse, CEVNT_BADDATE);
- }
- else
- if (parsetime->parse_status & CVT_BADTIME)
- {
- parse_event(parse, CEVNT_BADTIME);
- }
- else
- {
- parse_event(parse, CEVNT_BADREPLY); /* for the lack of something better */
- }
+ {
+ /* for the lack of something better */
+ parse_event(parse, CEVNT_BADREPLY);
+ }
+ break;
+ default:
+ /* huh? */
+ break;
}
return; /* skip the rest - useless */
}
=====================================
ntpd/refclock_modem.c
=====================================
--- a/ntpd/refclock_modem.c
+++ b/ntpd/refclock_modem.c
@@ -446,6 +446,10 @@ modem_message(
else
modem_timeout(peer, S_MSG);
return;
+
+ default:
+ /* huh? */
+ break;
}
/*
@@ -584,6 +588,10 @@ modem_timeout(
refclock_receive(peer);
}
break;
+
+ default:
+ /* huh? */
+ break;
}
modem_close(peer);
}
@@ -680,6 +688,10 @@ modem_poll(
return;
break;
+
+ default:
+ /* huh? */
+ break;
}
pp->polls++;
if (S_IDLE == up->state) {
=====================================
ntpd/refclock_oncore.c
=====================================
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -2201,6 +2201,9 @@ oncore_msg_BaEaHa(
else
oncore_sendmsg(instance, oncore_cmd_At2, sizeof(oncore_cmd_At2)); /* not GT, arg not VP */
break;
+ default:
+ /* huh? */
+ break;
}
/* Read back PPS Offset for Output */
@@ -2553,6 +2556,9 @@ oncore_msg_Bl(
case 1:
warn = WARN_PLUS;
break;
+ default:
+ /* huh? */
+ break;
}
}
}
@@ -2571,6 +2577,9 @@ oncore_msg_Bl(
instance->peer->leap = LEAP_ADDSECOND;
cp = "Set peer.leap to LEAP_ADDSECOND";
break;
+ default:
+ /* huh? */
+ break;
}
oncore_log(instance, LOG_NOTICE, cp);
=====================================
ntpd/refclock_truetime.c
=====================================
--- a/ntpd/refclock_truetime.c
+++ b/ntpd/refclock_truetime.c
@@ -799,6 +799,9 @@ true_doevent(
case s_Max:
msyslog(LOG_INFO, "TRUE: state %s is unexpected!",
stateStr(up->state));
+ default:
+ /* huh? */
+ break;
}
break;
default:
=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -261,6 +261,8 @@ def cmd_configure(ctx, config):
('w_format', '-Wformat'),
# fails on OpenBSD 6
('w_format_signedness', '-Wformat-signedness'),
+ ('w_shadow', '-Wshadow'),
+ ('w_init_self', '-Winit-self'),
]
# Check which linker flags are supported
@@ -297,7 +299,6 @@ def cmd_configure(ctx, config):
"-Wformat-nonliteral", # needs -Wformat
"-Wformat-security", # needs -Wformat
"-Wimplicit-function-declaration",
- "-Winit-self",
"-Winline",
"-Winvalid-pch",
"-Wmissing-declarations", # Not Ready For Prime Time
@@ -308,8 +309,7 @@ def cmd_configure(ctx, config):
# "-Wpadded", # duck... over 3k warnings
"-Wpointer-arith",
# "-Wredundant-decls", # incompatible w/ Unity
- "-Wshadow",
- "-Wswitch-default",
+ "-Wswitch-default", # warns on Bison bug
"-Wwrite-strings",
] + ctx.env.CFLAGS
cc_test_flags += [
@@ -327,7 +327,6 @@ def cmd_configure(ctx, config):
"-Wall",
"-Wextra",
"-Wmissing-prototypes",
- "-Wshadow",
"-Wstrict-prototypes",
"-Wundef",
"-Wunused",
@@ -385,6 +384,10 @@ int main(int argc, char **argv) {
ctx.env.CFLAGS = ['-Wformat-signedness'] + ctx.env.CFLAGS
if ctx.env.HAS_w_format:
ctx.env.CFLAGS = ['-Wformat'] + ctx.env.CFLAGS
+ if ctx.env.HAS_w_init_self:
+ ctx.env.CFLAGS = ['-Winit-self'] + ctx.env.CFLAGS
+ if ctx.env.HAS_w_shadow:
+ ctx.env.CFLAGS = ['-Wshadow'] + ctx.env.CFLAGS
if ctx.env.HAS_w_sign_conversion:
ctx.env.CFLAGS = ['-Wsign-conversion'] + ctx.env.CFLAGS
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/a7976858aa8fbad17c5200523e378690fb51a268...65c8b87fcef14aaf02e410663b77cfdcb2fca0f6
---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/a7976858aa8fbad17c5200523e378690fb51a268...65c8b87fcef14aaf02e410663b77cfdcb2fca0f6
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170414/b8b9d4cf/attachment.html>
More information about the vc
mailing list