aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-19 17:01:01 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-19 17:01:01 +0000
commit9b88b8977bdecd8471333afcd7f0cf3a9a91d249 (patch)
treefec3f9c968d25a3a77f49efca7618d53b0be024d /apps
parent44cea2546ad38c38e5c667647f15c870362f741d (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43280 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_dial.c2
-rw-r--r--apps/app_macro.c4
-rw-r--r--apps/app_queue.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c
index e2393336d..b214017bb 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1158,7 +1158,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
/* Again, keep going even if there's an error */
if (option_debug)
ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
- else if (option_verbose > 2)
+ if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", numsubst);
ast_hangup(tmp->chan);
tmp->chan = NULL;
diff --git a/apps/app_macro.c b/apps/app_macro.c
index ece2b09b6..ede17ccf7 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -227,14 +227,14 @@ static int macro_exec(struct ast_channel *chan, void *data)
case AST_PBX_KEEPALIVE:
if (option_debug)
ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
- else if (option_verbose > 1)
+ if (option_verbose > 1)
ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
goto out;
break;
default:
if (option_debug)
ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
- else if (option_verbose > 1)
+ if (option_verbose > 1)
ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
dead = 1;
goto out;
diff --git a/apps/app_queue.c b/apps/app_queue.c
index d3071a819..a10b2ad08 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1559,7 +1559,7 @@ static int ring_entry(struct queue_ent *qe, struct localuser *tmp, int *busies)
/* Again, keep going even if there's an error */
if (option_debug)
ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
- else if (option_verbose > 2)
+ if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", tmp->interface);
ast_hangup(tmp->chan);
tmp->chan = NULL;