mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

silence clang --analyze warnings

Browse Source
This commit is contained in:
Mark Andrews
2012-11-30 18:50:38 +11:00
parent 85a873f000
commit 4151109b94
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/named/client.c
View File

@@ -2594,10 +2594,10 @@ ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup_listlock: cleanup_listlock:
isc_mutex_destroy(&manager->listlock); (void) isc_mutex_destroy(&manager->listlock);
cleanup_lock: cleanup_lock:
isc_mutex_destroy(&manager->lock); (void) isc_mutex_destroy(&manager->lock);
cleanup_manager: cleanup_manager:
isc_mem_put(manager->mctx, manager, sizeof(*manager)); isc_mem_put(manager->mctx, manager, sizeof(*manager));

2
lib/dns/dispatch.c
View File

@@ -739,7 +739,7 @@ destroy_disp(isc_task_t *task, isc_event_t *event) {
if (disp->sepool != NULL) { if (disp->sepool != NULL) {
isc_mempool_destroy(&disp->sepool); isc_mempool_destroy(&disp->sepool);
isc_mutex_destroy(&disp->sepool_lock); (void)isc_mutex_destroy(&disp->sepool_lock);
} }
if (disp->socket != NULL) if (disp->socket != NULL)

4
lib/dns/rbt.c
View File

@@ -2065,6 +2065,8 @@ rehash(dns_rbt_t *rbt) {
return; return;
} }
INSIST(rbt->hashsize > 0);
for (i = 0; i < rbt->hashsize; i++) for (i = 0; i < rbt->hashsize; i++)
rbt->hashtable[i] = NULL; rbt->hashtable[i] = NULL;
@@ -2475,6 +2477,7 @@ deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
COLOR(sibling) = COLOR(parent); COLOR(sibling) = COLOR(parent);
MAKE_BLACK(parent); MAKE_BLACK(parent);
INSIST(RIGHT(sibling) != NULL);
MAKE_BLACK(RIGHT(sibling)); MAKE_BLACK(RIGHT(sibling));
rotate_left(parent, rootp); rotate_left(parent, rootp);
child = *rootp; child = *rootp;
@@ -2512,6 +2515,7 @@ deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
COLOR(sibling) = COLOR(parent); COLOR(sibling) = COLOR(parent);
MAKE_BLACK(parent); MAKE_BLACK(parent);
INSIST(LEFT(sibling) != NULL);
MAKE_BLACK(LEFT(sibling)); MAKE_BLACK(LEFT(sibling));
rotate_right(parent, rootp); rotate_right(parent, rootp);
child = *rootp; child = *rootp;

1
lib/dns/rbtdb.c
View 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 do it on the LRU side, so memory
* will not leak... for long. * will not leak... for long.
*/ */
INSIST(rbtdb->heaps != NULL);
isc_heap_insert(rbtdb->heaps[idx], newheader); isc_heap_insert(rbtdb->heaps[idx], newheader);
} else if (RESIGN(newheader)) } else if (RESIGN(newheader))
resign_insert(rbtdb, idx, newheader); resign_insert(rbtdb, idx, newheader);

4
lib/isc/include/isc/queue.h
View File

@@ -61,8 +61,8 @@
#define ISC_QUEUE_DESTROY(queue) \ #define ISC_QUEUE_DESTROY(queue) \
do { \ do { \
ISC_QLINK_INSIST(ISC_QUEUE_EMPTY(queue)); \ ISC_QLINK_INSIST(ISC_QUEUE_EMPTY(queue)); \
isc_mutex_destroy(&(queue).taillock); \ (void) isc_mutex_destroy(&(queue).taillock); \
isc_mutex_destroy(&(queue).headlock); \ (void) isc_mutex_destroy(&(queue).headlock); \
} while (0) } while (0)
/* /*