diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 17:01:01 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 17:01:01 +0000 |
| commit | 9b88b8977bdecd8471333afcd7f0cf3a9a91d249 (patch) | |
| tree | fec3f9c968d25a3a77f49efca7618d53b0be024d /pbx.c | |
| parent | 44cea2546ad38c38e5c667647f15c870362f741d (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 'pbx.c')
| -rw-r--r-- | pbx.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -2307,14 +2307,14 @@ static int __ast_pbx_run(struct ast_channel *c) case AST_PBX_KEEPALIVE: if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE on '%s'\n", c->context, c->exten, c->priority, c->name); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE on '%s'\n", c->context, c->exten, c->priority, c->name); goto out; break; default: if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) { c->_softhangup =0; @@ -2452,7 +2452,7 @@ out: /* Something bad happened, or a hangup has been requested. */ if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); break; } @@ -3672,7 +3672,7 @@ struct ast_context *ast_context_create(struct ast_context **extcontexts, const c *local_contexts = tmp; if (option_debug) ast_log(LOG_DEBUG, "Registered context '%s'\n", tmp->name); - else if (option_verbose > 2) + if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Registered extension context '%s'\n", tmp->name); } else ast_log(LOG_ERROR, "Out of memory\n"); @@ -4653,7 +4653,8 @@ int ast_add_extension2(struct ast_context *con, } else { \ ast_log(LOG_DEBUG, "Added extension '%s' priority %d to %s\n", tmp->exten, tmp->priority, con->name); \ } \ - } else if (option_verbose > 2) { \ + } \ + if (option_verbose > 2) { \ if (tmp->matchcid) { \ ast_verbose( VERBOSE_PREFIX_3 "Added extension '%s' priority %d (CID match '%s')to %s\n", tmp->exten, tmp->priority, tmp->cidmatch, con->name); \ } else { \ |