From 6a6dad000daeb4c9e806ea73d52cbb92ee24e3e5 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 21 Jun 2009 16:04:22 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@202260 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_manager.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 7a768632c2..337a04e0e4 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; }