summaryrefslogtreecommitdiff
path: root/main/astobj2.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2007-11-08 05:28:47 +0000
committerKevin P. Fleming <kpfleming@digium.com>2007-11-08 05:28:47 +0000
commitedc78d6023c379c19afff8c94632d7118295ff60 (patch)
tree444ea944312fd31b5524ee43f8cfc97e2884c6de /main/astobj2.c
parent950528b638cc290e4ea661ec3426f73230703e9e (diff)
improve linked-list macros in two ways:
- the *_CURRENT macros no longer need the list head pointer argument - add AST_LIST_MOVE_CURRENT to encapsulate the remove/add operation when moving entries between lists git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/astobj2.c')
-rw-r--r--main/astobj2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/astobj2.c b/main/astobj2.c
index c9c468017..8404f036d 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -467,7 +467,7 @@ void *ao2_callback(struct ao2_container *c,
/* we are going to modify the container, so update version */
ast_atomic_fetchadd_int(&c->version, 1);
- AST_LIST_REMOVE_CURRENT(&c->buckets[i], entry);
+ AST_LIST_REMOVE_CURRENT(entry);
/* update number of elements and version */
ast_atomic_fetchadd_int(&c->elements, -1);
ao2_ref(EXTERNAL_OBJ(x->astobj), -1);
@@ -488,7 +488,7 @@ void *ao2_callback(struct ao2_container *c,
#endif
}
}
- AST_LIST_TRAVERSE_SAFE_END
+ AST_LIST_TRAVERSE_SAFE_END;
}
ao2_unlock(c);
return ret;