diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-11-08 05:28:47 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-11-08 05:28:47 +0000 |
| commit | edc78d6023c379c19afff8c94632d7118295ff60 (patch) | |
| tree | 444ea944312fd31b5524ee43f8cfc97e2884c6de /main/loader.c | |
| parent | 950528b638cc290e4ea661ec3426f73230703e9e (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/loader.c')
| -rw-r--r-- | main/loader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/loader.c b/main/loader.c index d8567c840..e51505ea0 100644 --- a/main/loader.c +++ b/main/loader.c @@ -169,7 +169,7 @@ void ast_module_unregister(const struct ast_module_info *info) AST_LIST_LOCK(&module_list); AST_LIST_TRAVERSE_SAFE_BEGIN(&module_list, mod, entry) { if (mod->info == info) { - AST_LIST_REMOVE_CURRENT(&module_list, entry); + AST_LIST_REMOVE_CURRENT(entry); break; } } @@ -825,7 +825,7 @@ int load_modules(unsigned int preload_only) AST_LIST_TRAVERSE_SAFE_BEGIN(&load_order, order, entry) { if (!resource_name_match(order->resource, v->value)) { - AST_LIST_REMOVE_CURRENT(&load_order, entry); + AST_LIST_REMOVE_CURRENT(entry); ast_free(order->resource); ast_free(order); } @@ -849,7 +849,7 @@ int load_modules(unsigned int preload_only) switch (load_resource(order->resource, 1)) { case AST_MODULE_LOAD_SUCCESS: case AST_MODULE_LOAD_DECLINE: - AST_LIST_REMOVE_CURRENT(&load_order, entry); + AST_LIST_REMOVE_CURRENT(entry); ast_free(order->resource); ast_free(order); break; @@ -868,7 +868,7 @@ int load_modules(unsigned int preload_only) switch (load_resource(order->resource, 0)) { case AST_MODULE_LOAD_SUCCESS: case AST_MODULE_LOAD_DECLINE: - AST_LIST_REMOVE_CURRENT(&load_order, entry); + AST_LIST_REMOVE_CURRENT(entry); ast_free(order->resource); ast_free(order); break; @@ -961,7 +961,7 @@ int ast_loader_unregister(int (*v)(void)) AST_LIST_LOCK(&module_list); AST_LIST_TRAVERSE_SAFE_BEGIN(&updaters, cur, entry) { if (cur->updater == v) { - AST_LIST_REMOVE_CURRENT(&updaters, entry); + AST_LIST_REMOVE_CURRENT(entry); break; } } |