diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-07-08 06:46:58 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-07-08 06:46:58 -0500 |
| commit | f3fd648be6594052926aa64590489fcbc421ef95 (patch) | |
| tree | 02abd14cf76b3ab4308c7dc25f77d0bd2369dd22 | |
| parent | e26bd15e7a79d21ba0963d8ce38ec43e4550e225 (diff) | |
| parent | 9d4e664f6280cbc6e0c48d59f62ab34887fa1971 (diff) | |
Merge "REF_DEBUG: Prevent logging of container node objects." into 13
| -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 1cd6ee249..341ff79e0 100644 --- a/main/astobj2_hash.c +++ b/main/astobj2_hash.c @@ -298,7 +298,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_ref(node, -1); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } } @@ -331,7 +331,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_ref(node, -1); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } } diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c index d8195d47f..a8d5e3ac1 100644 --- a/main/astobj2_rbtree.c +++ b/main/astobj2_rbtree.c @@ -1267,7 +1267,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_ref(node, -1); return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED; } |