diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-14 21:41:09 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-14 21:41:09 +0000 |
commit | 4ad7fb3e3eb97dfcc2c94fe1f38ce4b0e8642ee9 (patch) | |
tree | 5504856a16a1aec786aed24d36f461bbe58f9fac /main/abstract_jb.c | |
parent | 01a8e6db758145b73234ff8ab26cfd6db20551a0 (diff) |
Merged revisions 116469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r116469 | russell | 2008-05-14 16:40:43 -0500 (Wed, 14 May 2008) | 12 lines
Merged revisions 116463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116463 | russell | 2008-05-14 16:32:00 -0500 (Wed, 14 May 2008) | 4 lines
Add ast_assert(), which can be used to handle fatal errors. It is only compiled
in if dev-mode is enabled, and only aborts if DO_CRASH is defined.
(inspired by issue #12650)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@116470 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/abstract_jb.c')
-rw-r--r-- | main/abstract_jb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c index df822f5ea..e51187d7b 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"); - CRASH; + ast_assert(0); break; } @@ -486,7 +486,7 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr) bridged = ast_bridged_channel(chan); if (!bridged) { /* We should always have bridged chan if a jitterbuffer is in use */ - CRASH; + ast_assert(0); } snprintf(name1, sizeof(name1), "%s", bridged->name); tmp = strchr(name1, '/'); |