diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:05:57 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:05:57 +0000 |
| commit | f184affffdc2610beffd9ce53ace47a17afb6c07 (patch) | |
| tree | 5d4e1c216d258304250c6dc1fad8cec70b6ee92a /cdr | |
| parent | 6d9ad4b6ff02dad22f8325bdc38935822793dbe5 (diff) | |
Merged revisions 202258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r202258 | russell | 2009-06-21 11:00:23 -0500 (Sun, 21 Jun 2009) | 2 lines
Standardize return values of load_config() so reload() doesn't report an error on success.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@202261 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_manager.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 8a4a43e1f..7859b58e6 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -59,12 +59,13 @@ static int load_config(int reload) int newenablecdr = 0; cfg = ast_config_load(CONF_FILE, config_flags); - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEUNCHANGED) { return 0; + } if (cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_ERROR, "Config file '%s' could not be parsed\n", CONF_FILE); - return 1; + return -1; } if (reload && customfields) { @@ -78,7 +79,7 @@ static int load_config(int reload) if (enablecdr) ast_cdr_unregister(name); enablecdr = 0; - return 0; + return -1; } while ( (cat = ast_category_browse(cfg, cat)) ) { @@ -117,7 +118,7 @@ static int load_config(int reload) ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log); enablecdr = newenablecdr; - return 1; + return 0; } static int manager_log(struct ast_cdr *cdr) @@ -190,9 +191,9 @@ static int unload_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_SUCCESS; } |