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/srv.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/srv.c')
| -rw-r--r-- | main/srv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/srv.c b/main/srv.c index 898195dc1..e9c6d650d 100644 --- a/main/srv.c +++ b/main/srv.c @@ -132,7 +132,7 @@ static int srv_callback(void *context, unsigned char *answer, int len, unsigned if (current->priority <= entry->priority) continue; - AST_LIST_INSERT_BEFORE_CURRENT(&c->entries, entry, list); + AST_LIST_INSERT_BEFORE_CURRENT(entry, list); entry = NULL; break; } @@ -167,8 +167,7 @@ static void process_weights(struct srv_context *context) if (current->priority != cur_priority) break; - AST_LIST_REMOVE_CURRENT(&context->entries, list); - AST_LIST_INSERT_TAIL(&temp_list, current, list); + AST_LIST_MOVE_CURRENT(&temp_list, list); } AST_LIST_TRAVERSE_SAFE_END; @@ -190,8 +189,7 @@ static void process_weights(struct srv_context *context) if (current->weight < random_weight) continue; - AST_LIST_REMOVE_CURRENT(&temp_list, list); - AST_LIST_INSERT_TAIL(&newlist, current, list); + AST_LIST_MOVE_CURRENT(&newlist, list); } AST_LIST_TRAVERSE_SAFE_END; } |