kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standardize return values of load_config() so reload() doesn't report an error on success.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-21 16:00:23 +00:00
parent f57752d380
commit 32fdcc00b2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cdr/cdr_manager.c
View File

@@ -64,12 +64,13 @@ static int load_config(int reload)
int newenablecdr = 0; int newenablecdr = 0;
cfg = ast_config_load(CONF_FILE, config_flags); cfg = ast_config_load(CONF_FILE, config_flags);
if (cfg == CONFIG_STATUS_FILEUNCHANGED) if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
return 0; return 0;
}
if (cfg == CONFIG_STATUS_FILEINVALID) { if (cfg == CONFIG_STATUS_FILEINVALID) {
ast_log(LOG_ERROR, "Config file '%s' could not be parsed\n", CONF_FILE); ast_log(LOG_ERROR, "Config file '%s' could not be parsed\n", CONF_FILE);
return 1; return -1;
} }
if (reload && customfields) { if (reload && customfields) {
@@ -83,7 +84,7 @@ static int load_config(int reload)
if (enablecdr) if (enablecdr)
ast_cdr_unregister(name); ast_cdr_unregister(name);
enablecdr = 0; enablecdr = 0;
return 0; return -1;
} }
while ( (cat = ast_category_browse(cfg, cat)) ) { while ( (cat = ast_category_browse(cfg, cat)) ) {
@@ -122,7 +123,7 @@ static int load_config(int reload)
ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log); ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log);
enablecdr = newenablecdr; enablecdr = newenablecdr;
return 1; return 0;
} }
static int manager_log(struct ast_cdr *cdr) static int manager_log(struct ast_cdr *cdr)
@@ -199,9 +200,9 @@ static int unload_module(void)
static int load_module(void) static int load_module(void)
{ {
/* Configuration file */ if (load_config(0)) {
if (!load_config(0))
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
}
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} }