diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 18:20:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 18:20:18 +0000 |
| commit | a1e5e9b6643a99df9ebf2c17b6c9d00d506e53c8 (patch) | |
| tree | 0c5e9551ee6aff27e52afd2cfad55ae4550d59e4 /main | |
| parent | 7143b0381c4e95b6081e0e89ae52bdda859f00f1 (diff) | |
Merged revisions 121867 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r121867 | tilghman | 2008-06-11 13:19:24 -0500 (Wed, 11 Jun 2008) | 11 lines
Merged revisions 121861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121861 | tilghman | 2008-06-11 13:18:16 -0500 (Wed, 11 Jun 2008) | 3 lines
Make calls to ast_assert() actually test something, so that the error message
printed is not nonsensical (reported by mvanbaak via #asterisk-bugs).
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121872 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/abstract_jb.c | 9 | ||||
| -rw-r--r-- | main/channel.c | 4 | ||||
| -rw-r--r-- | main/sched.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c index e51187d7b..557e5c205 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -430,7 +430,7 @@ static void jb_get_and_deliver(struct ast_channel *chan) return; default: ast_log(LOG_ERROR, "This should never happen!\n"); - ast_assert(0); + ast_assert("JB type unknown" == NULL); break; } @@ -484,10 +484,9 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr) *tmp = '#'; bridged = ast_bridged_channel(chan); - if (!bridged) { - /* We should always have bridged chan if a jitterbuffer is in use */ - ast_assert(0); - } + /* We should always have bridged chan if a jitterbuffer is in use */ + ast_assert(bridged != NULL); + snprintf(name1, sizeof(name1), "%s", bridged->name); tmp = strchr(name1, '/'); if (tmp) diff --git a/main/channel.c b/main/channel.c index f0f11b3ca..30720ebb5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -975,7 +975,7 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin) if (((fin->frametype == AST_FRAME_VOICE) && (qlen > 96)) || (qlen > 128)) { if (fin->frametype != AST_FRAME_VOICE) { ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name); - ast_assert(0); + ast_assert(fin->frametype == AST_FRAME_VOICE); } else { ast_debug(1, "Dropping voice to exceptionally long queue on %s\n", chan->name); ast_frfree(f); @@ -1611,7 +1611,7 @@ int ast_hangup(struct ast_channel *chan) ast_log(LOG_WARNING, "Hard hangup called by thread %ld on %s, while fd " "is blocked by thread %ld in procedure %s! Expect a failure\n", (long)pthread_self(), chan->name, (long)chan->blocker, chan->blockproc); - ast_assert(0); + ast_assert(ast_test_flag(chan, AST_FLAG_BLOCKING) == 0); } if (!ast_test_flag(chan, AST_FLAG_ZOMBIE)) { ast_debug(1, "Hanging up channel '%s'\n", chan->name); diff --git a/main/sched.c b/main/sched.c index e5b46a85c..fdb0c7e8c 100644 --- a/main/sched.c +++ b/main/sched.c @@ -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(0); + ast_assert(s != NULL); return -1; } |