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 /res/res_jabber.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 'res/res_jabber.c')
| -rw-r--r-- | res/res_jabber.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index c4d626ccb..464f6a22c 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -1493,14 +1493,14 @@ static void aji_handle_message(struct aji_client *client, ikspak *pak) AST_LIST_LOCK(&client->messages); AST_LIST_TRAVERSE_SAFE_BEGIN(&client->messages, tmp, list) { if (flag) { - AST_LIST_REMOVE_CURRENT(&client->messages, list); + AST_LIST_REMOVE_CURRENT(list); if (tmp->from) ast_free(tmp->from); if (tmp->message) ast_free(tmp->message); } else if (difftime(time(NULL), tmp->arrived) >= client->message_timeout) { flag = 1; - AST_LIST_REMOVE_CURRENT(&client->messages, list); + AST_LIST_REMOVE_CURRENT(list); if (tmp->from) ast_free(tmp->from); if (tmp->message) |