From a8184b35cdee34425dec2d29829e996232baec3d Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 9 Mar 2020 18:23:13 -0700 Subject: [PATCH] remove or comment empty conditional branches some empty conditional branches which contained a semicolon were "fixed" by clang-format to contain nothing. add comments to prevent this. (cherry picked from commit 735be3b816913f8fae3153366ec89e5511ff52b4) --- bin/named/zoneconf.c | 2 ++ lib/dns/rdata/in_1/wks_11.c | 10 ++++------ lib/dns/zoneverify.c | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 30ec0c430f..69ba8edc96 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -1638,6 +1638,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } else if (strcasecmp(arg, "maintain") == 0) { allow = maint = true; } else if (strcasecmp(arg, "off") == 0) { + /* Default */ } else { INSIST(0); ISC_UNREACHABLE(); @@ -1792,6 +1793,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setkeyopt(zone, DNS_ZONEKEY_NORESIGN, true); } else if (strcasecmp(arg, "maintain") == 0) { + /* Default */ } else { INSIST(0); ISC_UNREACHABLE(); diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index ca606e25a1..942290362d 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -78,7 +78,7 @@ fromtext_in_wks(ARGS_FROMTEXT) { isc_token_t token; isc_region_t region; struct in_addr addr; - char *e; + char *e = NULL; long proto; unsigned char bm[8 * 1024]; /* 64k bits */ long port; @@ -138,8 +138,7 @@ fromtext_in_wks(ARGS_FROMTEXT) { false)); proto = strtol(DNS_AS_STR(token), &e, 10); - if (*e == 0) { - } else if (!mygetprotobyname(DNS_AS_STR(token), &proto)) { + if (*e != '\0' && !mygetprotobyname(DNS_AS_STR(token), &proto)) { CHECKTOK(DNS_R_UNKNOWNPROTO); } @@ -175,9 +174,8 @@ fromtext_in_wks(ARGS_FROMTEXT) { } port = strtol(DNS_AS_STR(token), &e, 10); - if (*e == 0) { - } else if (!mygetservbyname(service, ps, &port) && - !mygetservbyname(DNS_AS_STR(token), ps, &port)) + if (*e != 0 && !mygetservbyname(service, ps, &port) && + !mygetservbyname(DNS_AS_STR(token), ps, &port)) { CHECKTOK(DNS_R_UNKNOWNSERVICE); } diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c index 81b8aabafd..2d41a4cf31 100644 --- a/lib/dns/zoneverify.c +++ b/lib/dns/zoneverify.c @@ -1611,6 +1611,7 @@ check_dnskey(vctx_t *vctx) { is_ksk = ((dnskey.flags & DNS_KEYFLAG_KSK) != 0); if ((dnskey.flags & DNS_KEYOWNER_ZONE) == 0) { + /* Non zone key, skip. */ } else if ((dnskey.flags & DNS_KEYFLAG_REVOKE) != 0) { if ((dnskey.flags & DNS_KEYFLAG_KSK) != 0 && !dns_dnssec_selfsigns(&rdata, vctx->origin,