diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-08 05:28:47 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-08 05:28:47 +0000 |
| commit | a45a413db3bdce126d5cb28ed49b776fdebb4b1d (patch) | |
| tree | 444ea944312fd31b5524ee43f8cfc97e2884c6de /main/channel.c | |
| parent | beabbf77e66fbdd59fdcb5e12dade8039fd0b683 (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: http://svn.digium.com/svn/asterisk/trunk@89106 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/channel.c b/main/channel.c index b2f993d25..a0769fa0e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -451,13 +451,13 @@ void ast_channel_unregister(const struct ast_channel_tech *tech) AST_LIST_TRAVERSE_SAFE_BEGIN(&backends, chan, list) { if (chan->tech == tech) { - AST_LIST_REMOVE_CURRENT(&backends, list); + AST_LIST_REMOVE_CURRENT(list); ast_free(chan); ast_verb(2, "Unregistered channel type '%s'\n", tech->type); break; } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; AST_RWLIST_UNLOCK(&channels); } @@ -1256,12 +1256,12 @@ int ast_channel_datastore_remove(struct ast_channel *chan, struct ast_datastore /* Find our position and remove ourselves */ AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->datastores, datastore2, entry) { if (datastore2 == datastore) { - AST_LIST_REMOVE_CURRENT(&chan->datastores, entry); + AST_LIST_REMOVE_CURRENT(entry); res = 0; break; } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; return res; } |