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 /config.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 'config.c')
-rw-r--r-- | config.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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; } |