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/sched.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/sched.c')
| -rw-r--r-- | main/sched.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/sched.c b/main/sched.c index a68692db0..986badd16 100644 --- a/main/sched.c +++ b/main/sched.c @@ -177,11 +177,11 @@ static void schedule(struct sched_context *con, struct sched *s) AST_LIST_TRAVERSE_SAFE_BEGIN(&con->schedq, cur, list) { if (ast_tvcmp(s->when, cur->when) == -1) { - AST_LIST_INSERT_BEFORE_CURRENT(&con->schedq, s, list); + AST_LIST_INSERT_BEFORE_CURRENT(s, list); break; } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; if (!cur) AST_LIST_INSERT_TAIL(&con->schedq, s, list); @@ -278,13 +278,13 @@ int ast_sched_del(struct sched_context *con, int id) ast_mutex_lock(&con->lock); AST_LIST_TRAVERSE_SAFE_BEGIN(&con->schedq, s, list) { if (s->id == id) { - AST_LIST_REMOVE_CURRENT(&con->schedq, list); + AST_LIST_REMOVE_CURRENT(list); con->schedcnt--; sched_release(con, s); break; } } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; #ifdef DUMP_SCHEDULER /* Dump contents of the context while we have the lock so nothing gets screwed up by accident. */ |