aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_vpb.c
diff options
context:
space:
mode:
authormogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-27 19:31:54 +0000
committermogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-27 19:31:54 +0000
commit7f2b0a39ea4bb48a13955fb3737b821ff4b0a1a5 (patch)
tree2db53aac89642dfbf8abe1d2a765fd76bc17106f /channels/chan_vpb.c
parent33cdd88430f3166291238739ecbb0759f417d48d (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_vpb.c')
-rw-r--r--channels/chan_vpb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index a43a1f498..87a655cf9 100644
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -923,7 +923,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
else if (e->data == VPB_FAX){
if (!p->faxhandled){
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 (option_verbose > 2)