summaryrefslogtreecommitdiff
path: root/main/asterisk.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/asterisk.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/asterisk.c')
-rw-r--r--main/asterisk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 61c4ea526..7ba306233 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -286,7 +286,7 @@ void ast_unregister_file_version(const char *file)
AST_RWLIST_WRLOCK(&file_versions);
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&file_versions, find, list) {
if (!strcasecmp(find->file, file)) {
- AST_RWLIST_REMOVE_CURRENT(&file_versions, list);
+ AST_RWLIST_REMOVE_CURRENT(list);
break;
}
}
@@ -325,7 +325,7 @@ void ast_unregister_thread(void *id)
AST_RWLIST_WRLOCK(&thread_list);
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&thread_list, x, list) {
if ((void *) x->id == id) {
- AST_RWLIST_REMOVE_CURRENT(&thread_list, list);
+ AST_RWLIST_REMOVE_CURRENT(list);
break;
}
}
@@ -747,11 +747,11 @@ void ast_unregister_atexit(void (*func)(void))
AST_RWLIST_WRLOCK(&atexits);
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&atexits, ae, list) {
if (ae->func == func) {
- AST_RWLIST_REMOVE_CURRENT(&atexits, list);
+ AST_RWLIST_REMOVE_CURRENT(list);
break;
}
}
- AST_RWLIST_TRAVERSE_SAFE_END
+ AST_RWLIST_TRAVERSE_SAFE_END;
AST_RWLIST_UNLOCK(&atexits);
if (ae)