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/config.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/config.c')
| -rw-r--r-- | main/config.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/config.c b/main/config.c index 736c5428e..59b1840fd 100644 --- a/main/config.c +++ b/main/config.c @@ -545,11 +545,9 @@ static void ast_destroy_comments(struct ast_category *cat) static void ast_destroy_template_list(struct ast_category *cat) { struct ast_category_template_instance *x; - AST_LIST_TRAVERSE_SAFE_BEGIN(&cat->template_instances, x, next) { - AST_LIST_REMOVE_CURRENT(&cat->template_instances, next); + + while ((x = AST_LIST_REMOVE_HEAD(&cat->template_instances, next))) free(x); - } - AST_LIST_TRAVERSE_SAFE_END; } void ast_category_destroy(struct ast_category *cat) |