summaryrefslogtreecommitdiff
path: root/pbx.c
diff options
context:
space:
mode:
authorMatt O'Gorman <mogorman@digium.com>2006-03-27 19:31:54 +0000
committerMatt O'Gorman <mogorman@digium.com>2006-03-27 19:31:54 +0000
commita5ece3388a82dcd27ee7d234891079709f6bea5b (patch)
tree2db53aac89642dfbf8abe1d2a765fd76bc17106f /pbx.c
parentf274b642aaacc08ab2a02d0783a2470ec8b1efd3 (diff)
Janitor work converting !ast_strlen_zero(a)?a:b
to S_OR functions. from bug note 6805 with minor modifications. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx.c')
-rw-r--r--pbx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pbx.c b/pbx.c
index 278c18028..296e54c21 100644
--- a/pbx.c
+++ b/pbx.c
@@ -4311,8 +4311,8 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex
tmpchan->writeformat = chan->writeformat;
/* Setup proper location */
ast_explicit_goto(tmpchan,
- (!ast_strlen_zero(context)) ? context : chan->context,
- (!ast_strlen_zero(exten)) ? exten : chan->exten,
+ S_OR(context, chan->context),
+ S_OR(exten, chan->exten),
priority);
/* Masquerade into temp channel */