mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user