]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
projects / thirdparty / bind9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 301458d)
Update assertions to be more correct, and also remove use of a reserved word (#43090)
authorMukund Sivaraman <muks@isc.org>
Mon, 29 Aug 2016 13:22:49 +0000 (18:52 +0530)
committerMukund Sivaraman <muks@isc.org>
Mon, 29 Aug 2016 13:24:02 +0000 (18:54 +0530)
Note: this doesn't actually fix #43090.
(cherry picked from commit becac651e893c38e70a798124c7e306942c461bc)

CHANGES patch | blob | blame | history
lib/dns/name.c patch | blob | blame | history
lib/isc/hash.c patch | blob | blame | history

diff --git a/CHANGES b/CHANGES
index 4a9dae72c2d282a2da90015d4fab5418cbb52064..ff86c43287fdc2fd7bbbaa1ef91966f7d30d84a9 100644 (file)
--- 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 <html> tags.
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 2f65357e80f272d8dc220f60f8e4f46fa51b0268..eb3190b74e663dde16f2bb20e95b4158c8149889 100644 (file)
--- 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 565f1ce30882d37259fa528a9b8d13f8fc17cbc8..a9c5992c58d49b858a9b2ff1dbd52369b48d3035 100644 (file)
--- 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) ?
Mirror of https://gitlab.isc.org/isc-projects/bind9.git