diff options
| author | Corey Farrell <git@cfware.com> | 2016-07-07 13:44:39 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-07-07 13:44:39 -0400 |
| commit | 7408c51a48cbe98f3e19c0935659bbba1b5f76bb (patch) | |
| tree | b59691f140be3586ad74f87f94058a079e9e118c | |
| parent | 9e10aa84969b3b6e57dde5a637c47f17f1fd4ef7 (diff) | |
REF_DEBUG: Prevent logging of container node objects.
Using AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE can result in an unref being
recorded to the refs log for the node being replaced. This prevents
logging of those unrefs since they would produce errors in
refcounter.py.
ASTERISK-26181 #close
Change-Id: Ie4fded84e8a1a58b3a59ce59dfd7eb0da3ddc5d4
| -rw-r--r-- | main/astobj2_hash.c | 4 | ||||
| -rw-r--r-- | main/astobj2_rbtree.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c index b036911b4..072cd1815 100644 --- a/main/astobj2_hash.c +++ b/main/astobj2_hash.c @@ -274,7 +274,7 @@ static enum ao2_container_insert hash_ao2_insert_node(struct ao2_container_hash break; case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: SWAP(cur->common.obj, node->common.obj); - ao2_t_ref(node, -1, "Discard the new node."); + ao2_t_ref(node, -1, NULL); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } } @@ -307,7 +307,7 @@ static enum ao2_container_insert hash_ao2_insert_node(struct ao2_container_hash break; case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: SWAP(cur->common.obj, node->common.obj); - ao2_t_ref(node, -1, "Discard the new node."); + ao2_t_ref(node, -1, NULL); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } } diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c index b06813d6f..03efd886f 100644 --- a/main/astobj2_rbtree.c +++ b/main/astobj2_rbtree.c @@ -1243,7 +1243,7 @@ static enum ao2_container_insert rb_ao2_insert_node(struct ao2_container_rbtree break; case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: SWAP(cur->common.obj, node->common.obj); - ao2_t_ref(node, -1, "Don't need the new node."); + ao2_t_ref(node, -1, NULL); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } |