kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remainder of kpfleming's astobj patch (bug #3183)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-12-29 07:50:15 +00:00
parent f19f4411e1
commit 9aace6da49
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/astobj.h
View File

@@ -179,6 +179,7 @@ extern "C" {
while((iterator = (container)->head)) { \ while((iterator = (container)->head)) { \
(container)->head = (iterator)->next[0]; \ (container)->head = (iterator)->next[0]; \
ASTOBJ_DESTROY(iterator,destructor); \ ASTOBJ_DESTROY(iterator,destructor); \
ASTOBJ_UNREF(iterator,destructor); \
} \ } \
ASTOBJ_CONTAINER_UNLOCK(container); \ ASTOBJ_CONTAINER_UNLOCK(container); \
} while(0) } while(0)
@@ -190,7 +191,7 @@ extern "C" {
ASTOBJ_CONTAINER_TRAVERSE(container, do { \ ASTOBJ_CONTAINER_TRAVERSE(container, do { \
ASTOBJ_RDLOCK(iterator); \ ASTOBJ_RDLOCK(iterator); \
if (!(comparefunc(iterator->field, (data)))) { \ if (!(comparefunc(iterator->field, (data)))) { \
found = ASTOBJ_REF(iterator); \ found = iterator; \
ASTOBJ_CONTAINER_WRLOCK(container); \ ASTOBJ_CONTAINER_WRLOCK(container); \
if (prev) \ if (prev) \
prev->next[0] = next; \ prev->next[0] = next; \
@@ -232,7 +233,7 @@ extern "C" {
do { \ do { \
ASTOBJ_CONTAINER_WRLOCK(container); \ ASTOBJ_CONTAINER_WRLOCK(container); \
(newobj)->next[0] = (container)->head; \ (newobj)->next[0] = (container)->head; \
(container)->head = (newobj); \ (container)->head = ASTOBJ_REF(newobj); \
ASTOBJ_CONTAINER_UNLOCK(container); \ ASTOBJ_CONTAINER_UNLOCK(container); \
} while(0) } while(0)