]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
lib/dns/rbt.c: Suppress nullPointerRedundantCheck warnings from Cppcheck
authorOndřej Surý <ondrej@sury.org>
Fri, 27 Sep 2019 08:28:30 +0000 (10:28 +0200)
committerOndřej Surý <ondrej@sury.org>
Thu, 3 Oct 2019 07:50:26 +0000 (09:50 +0200)
(cherry picked from commit 8be5c3fcfcbe7ed2dee3eaf508d0a674141636fa)

lib/dns/rbt.c

index dc2e8c76d446daa7e1bf283289825a3de6295505..9f5b15d199e5e9dd94bee0199c0a19a6d9b16aa4 100644 (file)
@@ -2690,6 +2690,7 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) {
         * Fix color violations.
         */
        if (IS_BLACK(item)) {
+               /* cppcheck-suppress nullPointerRedundantCheck symbolName=item */
                parent = PARENT(item);
 
                while (child != *rootp && IS_BLACK(child)) {
@@ -2707,6 +2708,7 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) {
 
                                INSIST(sibling != NULL);
 
+                               /* cppcheck-suppress nullPointerRedundantCheck symbolName=sibling */
                                if (IS_BLACK(LEFT(sibling)) &&
                                    IS_BLACK(RIGHT(sibling))) {
                                        MAKE_RED(sibling);
@@ -2746,6 +2748,7 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) {
 
                                INSIST(sibling != NULL);
 
+                               /* cppcheck-suppress nullPointerRedundantCheck symbolName=sibling */
                                if (IS_BLACK(LEFT(sibling)) &&
                                    IS_BLACK(RIGHT(sibling))) {
                                        MAKE_RED(sibling);
@@ -2877,6 +2880,7 @@ check_properties_helper(dns_rbtnode_t *node) {
                        return (false);
        }
 
+       /* cppcheck-suppress nullPointerRedundantCheck symbolName=node */
        if ((DOWN(node) != NULL) && (!IS_ROOT(DOWN(node))))
                return (false);
 
@@ -2914,12 +2918,15 @@ check_black_distance_helper(dns_rbtnode_t *node, size_t *distance) {
                return (true);
        }
 
+       /* cppcheck-suppress nullPointerRedundantCheck symbolName=node */
        if (!check_black_distance_helper(LEFT(node), &dl))
                return (false);
 
+       /* cppcheck-suppress nullPointerRedundantCheck symbolName=node */
        if (!check_black_distance_helper(RIGHT(node), &dr))
                return (false);
 
+       /* cppcheck-suppress nullPointerRedundantCheck symbolName=node */
        if (!check_black_distance_helper(DOWN(node), &dd))
                return (false);