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 /channels/chan_agent.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 'channels/chan_agent.c')
| -rw-r--r-- | channels/chan_agent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 6199dad50..9317aad89 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -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); if (ast_strlen_zero(tmpchan) ) 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) ) { args.extension = NULL; pos = 0; @@ -1837,7 +1837,7 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode) args.extension = NULL; pos = 0; } 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); if (!res) res = ast_waitstream(chan, AST_DIGIT_ANY); |