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/trunk@121867 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
9edea8c7af
commit
ba5ec156c0
|
@ -1018,7 +1018,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
|
|||
if (p->chan) {
|
||||
if (ast_test_flag(p->chan, AST_FLAG_BLOCKING)) {
|
||||
ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" );
|
||||
ast_assert(0);
|
||||
ast_assert(ast_test_flag(p->chan, AST_FLAG_BLOCKING) == 0);
|
||||
}
|
||||
}
|
||||
return tmp;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -983,7 +983,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);
|
||||
|
@ -1641,7 +1641,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);
|
||||
|
|
|
@ -373,7 +373,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;
|
||||
}
|
||||
|
||||
|
|
Reference in New Issue