From: Mark Andrews <marka@isc.org>
Date: Fri, 30 Nov 2012 07:50:38 +0000 (+1100)
Subject: silence clang --analyze warnings
X-Git-Tag: v9.10.0a1~682^2~2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4151109b94d197eb568b279b73022901c20e21b6;p=thirdparty%2Fbind9.git

silence clang --analyze warnings
---

diff --git a/bin/named/client.c b/bin/named/client.c
index 4eb6d3e5420..0bca10a2d05 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -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));
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index e6786954afa..b9086b737b6 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -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)
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 53d54104326..059822f67bc 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -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;
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index a2521f4a39b..b75372e4cab 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -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);
diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h
index fc421beaa8a..d71bce79868 100644
--- a/lib/isc/include/isc/queue.h
+++ b/lib/isc/include/isc/queue.h
@@ -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)
 
 /*