Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Janitor work converting !ast_strlen_zero(a)?a:b

Browse Source 
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
1.4
Matt O'Gorman 19 years ago
parent f274b642aa
commit a5ece3388a
14 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File

4
app.c
Unescape View File

@ -1059,7 +1059,7 @@ int ast_app_group_get_count(const char *group, const char *category)
if (ast_strlen_zero(group)) if (ast_strlen_zero(group))
return 0; return 0;
s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX; s = S_OR(category, GROUP_CATEGORY_PREFIX);
ast_copy_string(cat, s, sizeof(cat)); ast_copy_string(cat, s, sizeof(cat));
chan = NULL; chan = NULL;
@ -1089,7 +1089,7 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category)
if (regcomp(&regexbuf, groupmatch, REG_EXTENDED | REG_NOSUB)) if (regcomp(&regexbuf, groupmatch, REG_EXTENDED | REG_NOSUB))
return 0; return 0;
s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX; s = S_OR(category, GROUP_CATEGORY_PREFIX);
ast_copy_string(cat, s, sizeof(cat)); ast_copy_string(cat, s, sizeof(cat));
chan = NULL; chan = NULL;

4
apps/app_dial.c
Unescape View File

@ -541,7 +541,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
senddialevent(in, o->chan); senddialevent(in, o->chan);
/* After calling, set callerid to extension */ /* After calling, set callerid to extension */
if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID)) 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 */ /* 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) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst); ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst);
if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID)) 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. /* Put them in the list of outgoing thingies... We're ready now.
XXX If we're forcibly removed, these outgoing calls won't get XXX If we're forcibly removed, these outgoing calls won't get

2
apps/app_directory.c
Unescape View File

@ -179,7 +179,7 @@ static int play_mailbox_owner(struct ast_channel *chan, char *context, char *dia
} }
ast_stopstream(chan); ast_stopstream(chan);
} else { } else {
res = ast_say_character_str(chan, !ast_strlen_zero(name) ? name : ext, res = ast_say_character_str(chan, S_OR(name, ext),
AST_DIGIT_ANY, chan->language); AST_DIGIT_ANY, chan->language);
} }

2
apps/app_dumpchan.c
Unescape View File

@ -126,7 +126,7 @@ static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)
ast_print_group(cgrp, sizeof(cgrp), c->callgroup), ast_print_group(cgrp, sizeof(cgrp), c->callgroup),
ast_print_group(pgrp, sizeof(pgrp), c->pickupgroup), ast_print_group(pgrp, sizeof(pgrp), c->pickupgroup),
( c->appl ? c->appl : "(N/A)" ), ( c->appl ? c->appl : "(N/A)" ),
( c-> data ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"), ( c-> data ? S_OR(c->data, "(Empty)") : "(None)"),
(ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)")); (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));
return 0; return 0;

4
apps/app_meetme.c
Unescape View File

@ -1845,8 +1845,8 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
if (!strcasecmp(args.confno, confno)) { if (!strcasecmp(args.confno, confno)) {
/* Bingo it's a valid conference */ /* Bingo it's a valid conference */
cnf = build_conf(args.confno, cnf = build_conf(args.confno,
ast_strlen_zero(args.pin) ? "" : args.pin, S_OR(args.pin, ""),
ast_strlen_zero(args.pinadmin) ? "" : args.pinadmin, S_OR(args.pinadmin, ""),
make, dynamic, refcount); make, dynamic, refcount);
break; break;
} }

4
channels/chan_agent.c
Unescape View File

@ -1825,7 +1825,7 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode)
res = ast_app_getdata(chan, "agent-newlocation", tmpchan+pos, sizeof(tmpchan) - 2, 0); res = ast_app_getdata(chan, "agent-newlocation", tmpchan+pos, sizeof(tmpchan) - 2, 0);
if (ast_strlen_zero(tmpchan) ) if (ast_strlen_zero(tmpchan) )
break; break;
if(ast_exists_extension(chan, !ast_strlen_zero(context) ? context : "default", tmpchan,1, NULL) ) { if(ast_exists_extension(chan, S_OR(context,"default"), tmpchan,1, NULL) ) {
if(!allow_multiple_login(tmpchan,context) ) { if(!allow_multiple_login(tmpchan,context) ) {
args.extension = NULL; args.extension = NULL;
pos = 0; pos = 0;
@ -1837,7 +1837,7 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode)
args.extension = NULL; args.extension = NULL;
pos = 0; pos = 0;
} else { } else {
ast_log(LOG_WARNING, "Extension '%s@%s' is not valid for automatic login of agent '%s'\n", tmpchan, !ast_strlen_zero(context) ? context : "default", p->agent); ast_log(LOG_WARNING, "Extension '%s@%s' is not valid for automatic login of agent '%s'\n", tmpchan, S_OR(context, "default"), p->agent);
res = ast_streamfile(chan, "invalid", chan->language); res = ast_streamfile(chan, "invalid", chan->language);
if (!res) if (!res)
res = ast_waitstream(chan, AST_DIGIT_ANY); res = ast_waitstream(chan, AST_DIGIT_ANY);

16
channels/chan_iax2.c
Unescape View File

@ -4618,10 +4618,10 @@ static int iax2_show_channels(int fd, int argc, char *argv[])
if (iaxs[x]->bridgecallno) if (iaxs[x]->bridgecallno)
ast_cli(fd, FORMATB, ast_cli(fd, FORMATB,
iaxs[x]->owner ? iaxs[x]->owner->name : "(None)", iaxs[x]->owner ? iaxs[x]->owner->name : "(None)",
ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[x]->addr.sin_addr), ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[x]->addr.sin_addr),
!ast_strlen_zero(iaxs[x]->username) ? iaxs[x]->username : "(None)", S_OR(iaxs[x]->username, "(None)"),
iaxs[x]->callno, iaxs[x]->peercallno, iaxs[x]->callno, iaxs[x]->peercallno,
iaxs[x]->oseqno, iaxs[x]->iseqno, iaxs[x]->oseqno, iaxs[x]->iseqno,
iaxs[x]->bridgecallno ); iaxs[x]->bridgecallno );
else else
#endif #endif
@ -4646,9 +4646,9 @@ static int iax2_show_channels(int fd, int argc, char *argv[])
ast_cli(fd, FORMAT, ast_cli(fd, FORMAT,
iaxs[x]->owner ? iaxs[x]->owner->name : "(None)", iaxs[x]->owner ? iaxs[x]->owner->name : "(None)",
ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[x]->addr.sin_addr), ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[x]->addr.sin_addr),
!ast_strlen_zero(iaxs[x]->username) ? iaxs[x]->username : "(None)", S_OR(iaxs[x]->username, "(None)"),
iaxs[x]->callno, iaxs[x]->peercallno, iaxs[x]->callno, iaxs[x]->peercallno,
iaxs[x]->oseqno, iaxs[x]->iseqno, iaxs[x]->oseqno, iaxs[x]->iseqno,
lag, lag,
jitter, jitter,
localdelay, localdelay,
@ -5795,7 +5795,7 @@ static void register_peer_exten(struct iax2_peer *peer, int onoff)
char multi[256]; char multi[256];
char *stringp, *ext; char *stringp, *ext;
if (!ast_strlen_zero(regcontext)) { if (!ast_strlen_zero(regcontext)) {
ast_copy_string(multi, ast_strlen_zero(peer->regexten) ? peer->name : peer->regexten, sizeof(multi)); ast_copy_string(multi, S_OR(peer->regexten, peer->name), sizeof(multi));
stringp = multi; stringp = multi;
while((ext = strsep(&stringp, "&"))) { while((ext = strsep(&stringp, "&"))) {
if (onoff) { if (onoff) {

2
channels/chan_misdn.c
Unescape View File

@ -2641,7 +2641,7 @@ static int misdn_tx2ast_frm(struct chan_list * tmp, char * buf, int len )
if (!tmp->faxhandled) { if (!tmp->faxhandled) {
tmp->faxhandled++; tmp->faxhandled++;
if (strcmp(ast->exten, "fax")) { if (strcmp(ast->exten, "fax")) {
if (ast_exists_extension(ast, ast_strlen_zero(ast->macrocontext)? ast->context : ast->macrocontext, "fax", 1, AST_CID_P(ast))) { if (ast_exists_extension(ast, S_OR(ast->macrocontext, ast->context), "fax", 1, AST_CID_P(ast))) {
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->name); ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->name);
/* Save the DID/DNIS when we transfer the fax call to a "fax" extension */ /* Save the DID/DNIS when we transfer the fax call to a "fax" extension */

9
channels/chan_sip.c
Unescape View File

@ -1681,7 +1681,8 @@ static void register_peer_exten(struct sip_peer *peer, int onoff)
char multi[256]; char multi[256];
char *stringp, *ext; char *stringp, *ext;
if (!ast_strlen_zero(global_regcontext)) { if (!ast_strlen_zero(global_regcontext)) {
ast_copy_string(multi, ast_strlen_zero(peer->regexten) ? peer->name : peer->regexten, sizeof(multi));
ast_copy_string(multi, S_OR(peer->regexten, peer->name), sizeof(multi));
stringp = multi; stringp = multi;
while((ext = strsep(&stringp, "&"))) { while((ext = strsep(&stringp, "&"))) {
if (onoff) if (onoff)
@ -3190,7 +3191,7 @@ static void build_callid_pvt(struct sip_pvt *pvt)
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
char buf[33]; char buf[33];
const char *host = ast_strlen_zero(pvt->fromdomain) ? ast_inet_ntoa(iabuf, sizeof(iabuf), pvt->ourip) : pvt->fromdomain; const char *host = S_OR(pvt->fromdomain, ast_inet_ntoa(iabuf, sizeof(iabuf), pvt->ourip));
ast_string_field_build(pvt, callid, "%s@%s", generate_random_string(buf, sizeof(buf)), host); ast_string_field_build(pvt, callid, "%s@%s", generate_random_string(buf, sizeof(buf)), host);
@ -3202,7 +3203,7 @@ static void build_callid_registry(struct sip_registry *reg, struct in_addr ourip
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
char buf[33]; char buf[33];
const char *host = ast_strlen_zero(fromdomain) ? ast_inet_ntoa(iabuf, sizeof(iabuf), ourip) : fromdomain; const char *host = S_OR(fromdomain, ast_inet_ntoa(iabuf, sizeof(iabuf), ourip));
ast_string_field_build(reg, callid, "%s@%s", generate_random_string(buf, sizeof(buf)), host); ast_string_field_build(reg, callid, "%s@%s", generate_random_string(buf, sizeof(buf)), host);
} }
@ -8161,7 +8162,7 @@ static int _sip_show_peer(int type, int fd, struct mansession *s, struct message
auth = auth->next; auth = auth->next;
} }
ast_cli(fd, " Context : %s\n", peer->context); ast_cli(fd, " Context : %s\n", peer->context);
ast_cli(fd, " Subscr.Cont. : %s\n", ast_strlen_zero(peer->subscribecontext)?"<Not set>":peer->subscribecontext); ast_cli(fd, " Subscr.Cont. : %s\n", S_OR(peer->subscribecontext, "<Not set>") );
ast_cli(fd, " Language : %s\n", peer->language); ast_cli(fd, " Language : %s\n", peer->language);
if (!ast_strlen_zero(peer->accountcode)) if (!ast_strlen_zero(peer->accountcode))
ast_cli(fd, " Accountcode : %s\n", peer->accountcode); ast_cli(fd, " Accountcode : %s\n", peer->accountcode);

2
channels/chan_vpb.c
Unescape View File

@ -923,7 +923,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
else if (e->data == VPB_FAX){ else if (e->data == VPB_FAX){
if (!p->faxhandled){ if (!p->faxhandled){
if (strcmp(p->owner->exten, "fax")) { if (strcmp(p->owner->exten, "fax")) {
const char *target_context = ast_strlen_zero(p->owner->macrocontext) ? p->owner->context : p->owner->macrocontext; const char *target_context = S_OR(p->owner->macrocontext, p->owner->context);
if (ast_exists_extension(p->owner, target_context, "fax", 1, p->owner->cid.cid_num)) { if (ast_exists_extension(p->owner, target_context, "fax", 1, p->owner->cid.cid_num)) {
if (option_verbose > 2) if (option_verbose > 2)

12
channels/chan_zap.c
Unescape View File

@ -4559,9 +4559,9 @@ struct ast_frame *zt_read(struct ast_channel *ast)
} }
if (p->subs[index].needcallerid) { if (p->subs[index].needcallerid) {
ast_set_callerid(ast, !ast_strlen_zero(p->lastcid_num) ? p->lastcid_num : NULL, ast_set_callerid(ast, S_OR(p->lastcid_num, NULL),
!ast_strlen_zero(p->lastcid_name) ? p->lastcid_name : NULL, S_OR(p->lastcid_name, NULL),
!ast_strlen_zero(p->lastcid_num) ? p->lastcid_num : NULL S_OR(p->lastcid_num, NULL)
); );
p->subs[index].needcallerid = 0; p->subs[index].needcallerid = 0;
} }
@ -4751,7 +4751,7 @@ struct ast_frame *zt_read(struct ast_channel *ast)
if (!p->faxhandled) { if (!p->faxhandled) {
p->faxhandled++; p->faxhandled++;
if (strcmp(ast->exten, "fax")) { if (strcmp(ast->exten, "fax")) {
const char *target_context = ast_strlen_zero(ast->macrocontext) ? ast->context : ast->macrocontext; const char *target_context = S_OR(ast->macrocontext, ast->context);
if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) { if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) {
if (option_verbose > 2) if (option_verbose > 2)
@ -5213,7 +5213,7 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
tmp->cid.cid_dnid = ast_strdup(i->dnid); tmp->cid.cid_dnid = ast_strdup(i->dnid);
#ifdef PRI_ANI #ifdef PRI_ANI
ast_set_callerid(tmp, i->cid_num, i->cid_name, ast_strlen_zero(i->cid_ani) ? i->cid_num : i->cid_ani); ast_set_callerid(tmp, i->cid_num, i->cid_name, S_OR(i->cid_ani, i->cid_num));
#else #else
ast_set_callerid(tmp, i->cid_num, i->cid_name, i->cid_num); ast_set_callerid(tmp, i->cid_num, i->cid_name, i->cid_num);
#endif #endif
@ -8760,7 +8760,7 @@ static void *pri_dchannel(void *vpri)
if (c && !ast_pthread_create(&threadid, &attr, ss_thread, c)) { if (c && !ast_pthread_create(&threadid, &attr, ss_thread, c)) {
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Accepting overlap call from '%s' to '%s' on channel %d/%d, span %d\n", ast_verbose(VERBOSE_PREFIX_3 "Accepting overlap call from '%s' to '%s' on channel %d/%d, span %d\n",
plancallingnum, !ast_strlen_zero(pri->pvts[chanpos]->exten) ? pri->pvts[chanpos]->exten : "<unspecified>", plancallingnum, S_OR(pri->pvts[chanpos]->exten, "<unspecified>"),
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span); pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span);
} else { } else {
ast_log(LOG_WARNING, "Unable to start PBX on channel %d/%d, span %d\n", ast_log(LOG_WARNING, "Unable to start PBX on channel %d/%d, span %d\n",

4
cli.c
Unescape View File

@ -425,7 +425,7 @@ static int handle_chanlist(int fd, int argc, char *argv[])
durbuf, bc ? bc->name : "(None)"); durbuf, bc ? bc->name : "(None)");
} else if (verbose) { } else if (verbose) {
ast_cli(fd, VERBOSE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), ast_cli(fd, VERBOSE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state),
c->appl ? c->appl : "(None)", c->data ? ( !ast_strlen_zero(c->data) ? c->data : "(Empty)" ): "(None)", c->appl ? c->appl : "(None)", c->data ? S_OR(c->data, "(Empty)" ): "(None)",
c->cid.cid_num ? c->cid.cid_num : "", durbuf, c->cid.cid_num ? c->cid.cid_num : "", durbuf,
c->accountcode ? c->accountcode : "", bc ? bc->name : "(None)"); c->accountcode ? c->accountcode : "", bc ? bc->name : "(None)");
} else { } else {
@ -746,7 +746,7 @@ static int handle_showchan(int fd, int argc, char *argv[])
c->fout & 0x7fffffff, (c->fout & 0x80000000) ? " (DEBUGGED)" : "", (long)c->whentohangup, c->fout & 0x7fffffff, (c->fout & 0x80000000) ? " (DEBUGGED)" : "", (long)c->whentohangup,
cdrtime, c->_bridge ? c->_bridge->name : "<none>", ast_bridged_channel(c) ? ast_bridged_channel(c)->name : "<none>", cdrtime, c->_bridge ? c->_bridge->name : "<none>", ast_bridged_channel(c) ? ast_bridged_channel(c)->name : "<none>",
c->context, c->exten, c->priority, c->callgroup, c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ), c->context, c->exten, c->priority, c->callgroup, c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ),
( c-> data ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"), ( c-> data ? S_OR(c->data, "(Empty)") : "(None)"),
(ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)")); (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));
if(pbx_builtin_serialize_variables(c,buf,sizeof(buf))) if(pbx_builtin_serialize_variables(c,buf,sizeof(buf)))

4
pbx.c
Unescape View File

@ -4311,8 +4311,8 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex
tmpchan->writeformat = chan->writeformat; tmpchan->writeformat = chan->writeformat;
/* Setup proper location */ /* Setup proper location */
ast_explicit_goto(tmpchan, ast_explicit_goto(tmpchan,
(!ast_strlen_zero(context)) ? context : chan->context, S_OR(context, chan->context),
(!ast_strlen_zero(exten)) ? exten : chan->exten, S_OR(exten, chan->exten),
priority); priority);
/* Masquerade into temp channel */ /* Masquerade into temp channel */

6
res/res_musiconhold.c
Unescape View File

@ -1127,10 +1127,10 @@ static int moh_classes_show(int fd, int argc, char *argv[])
ast_mutex_lock(&moh_lock); ast_mutex_lock(&moh_lock);
for (class = mohclasses; class; class = class->next) { for (class = mohclasses; class; class = class->next) {
ast_cli(fd, "Class: %s\n", class->name); ast_cli(fd, "Class: %s\n", class->name);
ast_cli(fd, "\tMode: %s\n", ast_strlen_zero(class->mode) ? "<none>" : class->mode); ast_cli(fd, "\tMode: %s\n", S_OR(class->mode,"<none>"));
ast_cli(fd, "\tDirectory: %s\n", ast_strlen_zero(class->dir) ? "<none>" : class->dir); ast_cli(fd, "\tDirectory: %s\n", S_OR(class->dir, "<none>"));
if (ast_test_flag(class, MOH_CUSTOM)) if (ast_test_flag(class, MOH_CUSTOM))
ast_cli(fd, "\tApplication: %s\n", ast_strlen_zero(class->args) ? "<none>" : class->args); ast_cli(fd, "\tApplication: %s\n", S_OR(class->args, "<none>"));
ast_cli(fd, "\tFormat: %s\n", ast_getformatname(class->format)); ast_cli(fd, "\tFormat: %s\n", ast_getformatname(class->format));
} }
ast_mutex_unlock(&moh_lock); ast_mutex_unlock(&moh_lock);

Write Preview
Loading…
Cancel
Save