diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/asterisk.c | 2 | ||||
-rw-r--r-- | main/config.c | 10 | ||||
-rw-r--r-- | main/pbx.c | 11 |
3 files changed, 12 insertions, 11 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index e981a7677..2010c727f 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1185,7 +1185,7 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart) /* Called on exit */ if (option_verbose && ast_opt_console) ast_verbose("Asterisk %s ending (%d).\n", ast_active_channels() ? "uncleanly" : "cleanly", num); - else if (option_debug) + if (option_debug) ast_log(LOG_DEBUG, "Asterisk ending (%d).\n", num); manager_event(EVENT_FLAG_SYSTEM, "Shutdown", "Shutdown: %s\r\nRestart: %s\r\n", ast_active_channels() ? "Uncleanly" : "Cleanly", restart ? "True" : "False"); if (ast_socket > -1) { diff --git a/main/config.c b/main/config.c index ffd58b52b..9f7cfd4dc 100644 --- a/main/config.c +++ b/main/config.c @@ -717,21 +717,21 @@ static struct ast_config *config_text_file_load(const char *database, const char ast_log(LOG_WARNING, "'%s' is not a regular file, ignoring\n", fn); continue; } - if ((option_verbose > 1) && !option_debug) { + if (option_verbose > 1) { ast_verbose(VERBOSE_PREFIX_2 "Parsing '%s': ", fn); fflush(stdout); } if (!(f = fopen(fn, "r"))) { if (option_debug) ast_log(LOG_DEBUG, "No file to parse: %s\n", fn); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose( "Not found (%s)\n", strerror(errno)); continue; } count++; if (option_debug) ast_log(LOG_DEBUG, "Parsing %s\n", fn); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose("Found\n"); while(!feof(f)) { lineno++; @@ -835,7 +835,7 @@ int config_text_file_save(const char *configfile, const struct ast_config *cfg, #else if ((f = fopen(fn, "w"))) { #endif - if ((option_verbose > 1) && !option_debug) + if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Saving '%s': ", fn); fprintf(f, ";!\n"); fprintf(f, ";! Automatically generated configuration file\n"); @@ -872,7 +872,7 @@ int config_text_file_save(const char *configfile, const struct ast_config *cfg, } else { if (option_debug) printf("Unable to open for writing: %s\n", fn); - else if (option_verbose > 1) + if (option_verbose > 1) printf( "Unable to write (%s)", strerror(errno)); return -1; } diff --git a/main/pbx.c b/main/pbx.c index 977a284f1..5960df481 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2354,14 +2354,14 @@ static int __ast_pbx_run(struct ast_channel *c) if (res == 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); error = 1; break; } 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; @@ -2481,7 +2481,7 @@ static int __ast_pbx_run(struct ast_channel *c) /* 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; } @@ -3822,7 +3822,7 @@ static struct ast_context *__ast_context_create(struct ast_context **extcontexts *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); } @@ -4796,7 +4796,8 @@ int ast_add_extension2(struct ast_context *con, 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); |