kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "REF_DEBUG: Prevent logging of container node objects." into 13

Browse Source
This commit is contained in:
zuul
2016-07-08 06:46:58 -05:00
committed by Gerrit Code Review
parent e26bd15e7a 9d4e664f62
commit f3fd648be6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/astobj2_hash.c
View File

@@ -298,7 +298,7 @@ static enum ao2_container_insert hash_ao2_insert_node(struct ao2_container_hash
break; break;
case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE:
SWAP(cur->common.obj, node->common.obj); 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; 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; break;
case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE:
SWAP(cur->common.obj, node->common.obj); 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; return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED;
} }
} }

2
main/astobj2_rbtree.c
View File

@@ -1267,7 +1267,7 @@ static enum ao2_container_insert rb_ao2_insert_node(struct ao2_container_rbtree
break; break;
case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE: case AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE:
SWAP(cur->common.obj, node->common.obj); 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; return AO2_CONTAINER_INSERT_NODE_OBJ_REPLACED;
} }