[asterisk-commits] russell: branch 1.6.2 r202261 - in /branches/1.6.2: ./ cdr/cdr_manager.c

[SVN commits to the Asterisk project]

Author: russell
Date: Sun Jun 21 11:05:57 2009
New Revision: 202261

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202261
Log:
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.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/cdr/cdr_manager.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/cdr/cdr_manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/cdr/cdr_manager.c?view=diff&rev=202261&r1=202260&r2=202261
==============================================================================
--- branches/1.6.2/cdr/cdr_manager.c (original)
+++ branches/1.6.2/cdr/cdr_manager.c Sun Jun 21 11:05:57 2009
@@ -59,12 +59,13 @@
 	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 @@
 		if (enablecdr)
 			ast_cdr_unregister(name);
 		enablecdr = 0;
-		return 0;
+		return -1;
 	}
 
 	while ( (cat = ast_category_browse(cfg, cat)) ) {
@@ -117,7 +118,7 @@
 		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 load_module(void)
 {
-	/* Configuration file */
-	if (!load_config(0))
+	if (load_config(0)) {
 		return AST_MODULE_LOAD_DECLINE;
+	}
 
 	return AST_MODULE_LOAD_SUCCESS;
 }