automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43280 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index e2393336da9a86c55343949ebefb7133e73c1741..b214017bb8c5c6df4b3f9c84e7fdc51336c928ab 100644 (file)
--- 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 ece2b09b634effb1640104de9503227e8f0122ce..ede17ccf71be5b53098b4c2fed530d8a332d10bd 100644 (file)
--- 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 d3071a819371e4e4e6792bc858429ec7af53dfb4..a10b2ad0817c9360c8b02ea980034035cced4e31 100644 (file)
--- 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;

diff --git a/asterisk.c b/asterisk.c
index 27ed6a67edcfed154b63e8ea8a4f1e4c40d98d85..a5f07a2b223fbc24f63e2a3c3be1287206755b04 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -896,7 +896,7 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart)
        /* Called on exit */
        if (option_verbose && option_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/channels/chan_sip.c b/channels/chan_sip.c
index ece3bdbd64d6b93473b867cb0d1edf7070f7360c..c50a32c24a31e5c08149f83f5d8174fcdb32b670 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6534,7 +6534,7 @@ static int cb_extensionstate(char *context, char* exten, int state, void *data)
        }
        transmit_state_notify(p, state, 1, 1);
 
-       if (option_debug > 1)
+       if (option_verbose > 1)
                ast_verbose(VERBOSE_PREFIX_1 "Extension Changed %s new state %s for Notify User %s\n", exten, ast_extension_state2str(state), p->username);
        return 0;
 }

diff --git a/config.c b/config.c
index 1fe14a40cfcae01fb0225e119120eb9b62d2d4c8..b35045427921de4961656226b5bc2f569a264d7a 100644 (file)
--- a/config.c
+++ b/config.c
@@ -579,21 +579,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++;
@@ -697,7 +697,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");
@@ -732,7 +732,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/pbx.c b/pbx.c
index f5461803959809d0a66183928ea7d290474db849..cfa93195ef75bbdc2e31f7fdb272e91a149119e2 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -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 {  \

diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index f0d118b89e53ed8d72d79f812024523ea4a5df11..5a3779c2cb0708020633a15c85355a52928f771d 100644 (file)
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -496,7 +496,7 @@ int load_module(void)
        } else {
                if (option_debug)
                        ast_log(LOG_DEBUG, "Unable to start GTK console monitor -- ignoring\n");
-               else if (option_verbose > 1)
+               if (option_verbose > 1)
                        ast_verbose( VERBOSE_PREFIX_2 "GTK is not available -- skipping monitor\n");
        }
        return 0;