diff options
| author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 16:23:45 +0000 |
|---|---|---|
| committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 16:23:45 +0000 |
| commit | d5df46a93ee535f46c6e21dda422fa993620274d (patch) | |
| tree | a58a9222645e8ccbba65497c74d4df0ef7353d54 /main/config.c | |
| parent | a4b9dfccb4fc717972e6759a53d78a47babacf91 (diff) | |
similar patch for verbose vs debug with minor changes
bug 2617
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43272 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/config.c')
| -rw-r--r-- | main/config.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |