diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:00:23 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:00:23 +0000 |
| commit | caf4195f558d068015103ea50439b7dff3b59338 (patch) | |
| tree | d2cd90762f9d1bdbc9f4997e7908e3435fe590d6 /cdr | |
| parent | 444f87a06f4e417ab5508936734c0945548cdf90 (diff) | |
Standardize return values of load_config() so reload() doesn't report an error on success.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@202258 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 bee4f5002..82f8a6e17 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -64,12 +64,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) { @@ -83,7 +84,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)) ) { @@ -122,7 +123,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) @@ -199,9 +200,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; } |