kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make calls to ast_assert() actually test something, so that the error message

Browse Source 
printed is not nonsensical (reported by mvanbaak via #asterisk-bugs).


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@121861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-11 18:18:16 +00:00
parent 28bb6bf00c
commit 1c7d9e4c9a
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_agent.c
View File

@@ -1061,7 +1061,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;

7
main/abstract_jb.c
View File

@@ -433,7 +433,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;
}
@@ -487,10 +487,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);
}
ast_assert(bridged != NULL);
snprintf(name1, sizeof(name1), "%s", bridged->name);
tmp = strchr(name1, '/');
if (tmp)

4
main/channel.c
View File

@@ -912,7 +912,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 {
if (option_debug)
ast_log(LOG_DEBUG, "Dropping voice to exceptionally long queue on %s\n", chan->name);
@@ -1476,7 +1476,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)) {
if (option_debug)

2
main/sched.c
View File

@@ -282,7 +282,7 @@ int ast_sched_del(struct sched_context *con, int id)
if (!s) {
if (option_debug)
ast_log(LOG_DEBUG, "Attempted to delete nonexistent schedule entry %d!\n", id);
ast_assert(0);
ast_assert(s != NULL);
return -1;
}