diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-18 16:36:39 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-18 16:36:39 +0000 |
| commit | 4ff7dd248caa33d8fe904d5a16c8491f78bbaeea (patch) | |
| tree | 12a8c3b7ecbf9f91fa682e86f8c4ed6aafe17ac2 /main/sched.c | |
| parent | e7d0c371dd58eee861c10bf1eec7385217a4b03f (diff) | |
Merged revisions 131982 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r131982 | tilghman | 2008-07-18 11:33:56 -0500 (Fri, 18 Jul 2008) | 10 lines
Merged revisions 131970 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r131970 | tilghman | 2008-07-18 11:30:31 -0500 (Fri, 18 Jul 2008) | 2 lines
Make the ast_assert call within ast_sched_del report something useful.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131984 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/sched.c')
| -rw-r--r-- | main/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/sched.c b/main/sched.c index fdb0c7e8c..dd1174258 100644 --- a/main/sched.c +++ b/main/sched.c @@ -263,7 +263,7 @@ int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, co * would be two or more in the list with that * id. */ -int ast_sched_del(struct sched_context *con, int id) +int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function) { struct sched *s; @@ -289,7 +289,7 @@ int ast_sched_del(struct sched_context *con, int id) if (!s) { ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id); - ast_assert(s != NULL); + _ast_assert(0, "s != NULL", file, line, function); return -1; } |