[asterisk-commits] twilson: trunk r158374 - /trunk/cdr/cdr_csv.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Nov 21 11:08:16 2008
New Revision: 158374

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158374
Log:
Reloading the config and having no changes still initialized some settings to 0. Initialize settings after doing all of the cfg checks.

(closes issue #13942)
Reported by: davidw
Patches: 
      cdr_diff.txt uploaded by otherwiseguy (license 396)
Tested by: davidw

Modified:
    trunk/cdr/cdr_csv.c

Modified: trunk/cdr/cdr_csv.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_csv.c?view=diff&rev=158374&r1=158373&r2=158374
==============================================================================
--- trunk/cdr/cdr_csv.c (original)
+++ trunk/cdr/cdr_csv.c Fri Nov 21 11:08:16 2008
@@ -96,15 +96,15 @@
 	const char *tmp;
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 
+	if (!(cfg = ast_config_load(config, config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) {
+		ast_log(LOG_WARNING, "unable to load config: %s\n", config);
+		return 0;
+	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
+		return 1;
+
 	usegmtime = 0;
 	loguniqueid = 0;
 	loguserfield = 0;
-
-	if (!(cfg = ast_config_load(config, config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) {
-		ast_log(LOG_WARNING, "unable to load config: %s\n", config);
-		return 0;
-	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
-		return 1;
 
 	if (!(var = ast_variable_browse(cfg, "csv"))) {
 		ast_config_destroy(cfg);