diff options
| author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-27 19:31:54 +0000 |
|---|---|---|
| committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-27 19:31:54 +0000 |
| commit | 7f2b0a39ea4bb48a13955fb3737b821ff4b0a1a5 (patch) | |
| tree | 2db53aac89642dfbf8abe1d2a765fd76bc17106f /apps/app_dial.c | |
| parent | 33cdd88430f3166291238739ecbb0759f417d48d (diff) | |
Janitor work converting !ast_strlen_zero(a)?a:b
to S_OR functions. from bug note 6805 with minor
modifications.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@15283 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 22f3e213b..2f9a4b0a3 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -541,7 +541,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l senddialevent(in, o->chan); /* After calling, set callerid to extension */ if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID)) - ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, get_cid_name(cidname, sizeof(cidname), in), NULL); + ast_set_callerid(o->chan, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL); } } /* Hangup the original channel now, in case we needed it */ @@ -1135,7 +1135,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst); if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID)) - ast_set_callerid(tmp->chan, ast_strlen_zero(chan->macroexten) ? chan->exten : chan->macroexten, get_cid_name(cidname, sizeof(cidname), chan), NULL); + ast_set_callerid(tmp->chan, S_OR(chan->macroexten, chan->exten), get_cid_name(cidname, sizeof(cidname), chan), NULL); } /* Put them in the list of outgoing thingies... We're ready now. XXX If we're forcibly removed, these outgoing calls won't get |