From: Mukund Sivaraman Date: Mon, 29 Aug 2016 13:22:49 +0000 (+0530) Subject: Update assertions to be more correct, and also remove use of a reserved word (#43090) X-Git-Tag: v9.12.0a0~44 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=becac651e893c38e70a798124c7e306942c461bc;p=thirdparty%2Fbind9.git Update assertions to be more correct, and also remove use of a reserved word (#43090) Note: this doesn't actually fix #43090. --- diff --git a/CHANGES b/CHANGES index 4a9dae72c2d..ff86c43287f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ --- 9.11.0rc1 released --- +4458. [cleanup] Update assertions to be more correct, and also remove + use of a reserved word. [RT #43090] + 4457. [maint] Added AAAA (2001:500:a8::e) for E.ROOT-SERVERS.NET. 4456. [doc] Add DOCTYPE and lang attribute to tags. diff --git a/lib/dns/name.c b/lib/dns/name.c index 2f65357e80f..eb3190b74e6 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -105,17 +105,17 @@ static unsigned char maptolower[] = { #define CONVERTTOASCII(c) #define CONVERTFROMASCII(c) -#define INIT_OFFSETS(name, var, default) \ - if (name->offsets != NULL) \ - var = name->offsets; \ +#define INIT_OFFSETS(name, var, default_offsets) \ + if ((name)->offsets != NULL) \ + var = (name)->offsets; \ else \ - var = default; + var = (default_offsets); -#define SETUP_OFFSETS(name, var, default) \ - if (name->offsets != NULL) \ - var = name->offsets; \ +#define SETUP_OFFSETS(name, var, default_offsets) \ + if ((name)->offsets != NULL) \ + var = (name)->offsets; \ else { \ - var = default; \ + var = (default_offsets); \ set_offsets(name, var, NULL); \ } diff --git a/lib/isc/hash.c b/lib/isc/hash.c index 565f1ce3088..a9c5992c58d 100644 --- a/lib/isc/hash.c +++ b/lib/isc/hash.c @@ -439,7 +439,7 @@ isc_hash_function(const void *data, size_t length, const unsigned char *bp; const unsigned char *be; - INSIST(data == NULL || length > 0); + REQUIRE(length == 0 || data != NULL); RUNTIME_CHECK(isc_once_do(&fnv_once, fnv_initialize) == ISC_R_SUCCESS); hval = ISC_UNLIKELY(previous_hashp != NULL) ? @@ -506,7 +506,7 @@ isc_hash_function_reverse(const void *data, size_t length, const unsigned char *bp; const unsigned char *be; - INSIST(data == NULL || length > 0); + REQUIRE(length == 0 || data != NULL); RUNTIME_CHECK(isc_once_do(&fnv_once, fnv_initialize) == ISC_R_SUCCESS); hval = ISC_UNLIKELY(previous_hashp != NULL) ?