diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-01-27 23:14:48 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-01-27 23:14:48 +0000 |
| commit | 69ade72e3cc397142036db1e71d49c94daa2d43c (patch) | |
| tree | fe8d41968e18de37ca1f6a42b55f4075ed2cfe51 /channels/chan_iax2.c | |
| parent | ac699196f54f4a4659b605c02cfdac6c23d7d971 (diff) | |
With the switch to the ast_sched_replace* API in trunk, we lose the correction
that was just merged from 1.4, so this is a changeover to those APIs to use the
macro versions, so that we properly detect errors from ast_sched_del, instead
of simply ignoring the return values.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index b2a04b502..faa8337f8 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1094,14 +1094,12 @@ static int __schedule_action(void (*func)(const void *data), const void *data, c #define schedule_action(func, data) __schedule_action(func, data, __PRETTY_FUNCTION__) #endif -static int iax2_sched_replace(int old_id, struct sched_context *con, int when, ast_sched_cb callback, const void *data) +static int iax2_sched_replace(int id, struct sched_context *con, int when, ast_sched_cb callback, const void *data) { - int res; - - res = ast_sched_replace(old_id, con, when, callback, data); + AST_SCHED_REPLACE(id, con, when, callback, data); signal_condition(&sched_lock, &sched_cond); - return res; + return id; } static int iax2_sched_add(struct sched_context *con, int when, ast_sched_cb callback, const void *data) |