diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:02:50 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:02:50 +0000 |
| commit | dcd0c6d2b3a735b988f9168e0da7ba38c5d52ca7 (patch) | |
| tree | 933a9585cd954d818b80e6e80433fbf907a9616f /cdr | |
| parent | fc38468b9c7a8b6389b2ecf35f4397a2deb51770 (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.0@202259 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_manager.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 8b2ab215d..babe2d965 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -59,8 +59,9 @@ 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 (reload && customfields) { ast_free(customfields); @@ -73,7 +74,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)) ) { @@ -112,7 +113,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) @@ -185,9 +186,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; } |