]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
silence clang --analyze warnings
authorMark Andrews <marka@isc.org>
Fri, 30 Nov 2012 07:50:38 +0000 (18:50 +1100)
committerMark Andrews <marka@isc.org>
Fri, 30 Nov 2012 07:50:38 +0000 (18:50 +1100)
bin/named/client.c
lib/dns/dispatch.c
lib/dns/rbt.c
lib/dns/rbtdb.c
lib/isc/include/isc/queue.h

index 4eb6d3e5420e05eae23aa3073d0c7548bc14b952..0bca10a2d053a2a5e74d92c39fd8003e3778289d 100644 (file)
@@ -2594,10 +2594,10 @@ ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
        return (ISC_R_SUCCESS);
 
  cleanup_listlock:
-       isc_mutex_destroy(&manager->listlock);
+       (void) isc_mutex_destroy(&manager->listlock);
 
  cleanup_lock:
-       isc_mutex_destroy(&manager->lock);
+       (void) isc_mutex_destroy(&manager->lock);
 
  cleanup_manager:
        isc_mem_put(manager->mctx, manager, sizeof(*manager));
index e6786954afa2647fd03f15ded1306a1cc86a929f..b9086b737b62c074f15490376a9b0152ced12997 100644 (file)
@@ -739,7 +739,7 @@ destroy_disp(isc_task_t *task, isc_event_t *event) {
 
        if (disp->sepool != NULL) {
                isc_mempool_destroy(&disp->sepool);
-               isc_mutex_destroy(&disp->sepool_lock);
+               (void)isc_mutex_destroy(&disp->sepool_lock);
        }
 
        if (disp->socket != NULL)
index 53d5410432607b302e2b110990dd6bcffbba47c2..059822f67bc31289e102a05cb69ecbe9f3167b00 100644 (file)
@@ -2065,6 +2065,8 @@ rehash(dns_rbt_t *rbt) {
                return;
        }
 
+       INSIST(rbt->hashsize > 0);
+
        for (i = 0; i < rbt->hashsize; i++)
                rbt->hashtable[i] = NULL;
 
@@ -2475,6 +2477,7 @@ deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
 
                                        COLOR(sibling) = COLOR(parent);
                                        MAKE_BLACK(parent);
+                                       INSIST(RIGHT(sibling) != NULL);
                                        MAKE_BLACK(RIGHT(sibling));
                                        rotate_left(parent, rootp);
                                        child = *rootp;
@@ -2512,6 +2515,7 @@ deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
 
                                        COLOR(sibling) = COLOR(parent);
                                        MAKE_BLACK(parent);
+                                       INSIST(LEFT(sibling) != NULL);
                                        MAKE_BLACK(LEFT(sibling));
                                        rotate_right(parent, rootp);
                                        child = *rootp;
index a2521f4a39b2bc1d80657a51a865473e326b70f1..b75372e4cabbdf24de6fb0ca93f1bcbceade2dc2 100644 (file)
@@ -6345,6 +6345,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                                 * will do it on the LRU side, so memory
                                 * will not leak... for long.
                                 */
+                               INSIST(rbtdb->heaps != NULL);
                                isc_heap_insert(rbtdb->heaps[idx], newheader);
                        } else if (RESIGN(newheader))
                                resign_insert(rbtdb, idx, newheader);
index fc421beaa8a1389cca3be1a4127606b23365b7b6..d71bce79868a2536db31df42938b35aecc908bce 100644 (file)
@@ -61,8 +61,8 @@
 #define ISC_QUEUE_DESTROY(queue) \
        do { \
                ISC_QLINK_INSIST(ISC_QUEUE_EMPTY(queue)); \
-               isc_mutex_destroy(&(queue).taillock); \
-               isc_mutex_destroy(&(queue).headlock); \
+               (void) isc_mutex_destroy(&(queue).taillock); \
+               (void) isc_mutex_destroy(&(queue).headlock); \
        } while (0)
 
 /*