kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

similar patch for verbose vs debug with minor changes

Browse Source 
bug 2617


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-09-19 16:23:45 +00:00
parent 65abfac363
commit d0a1a0033d
8 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/config.c
View File

@@ -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;
}