[Asterisk-cvs] asterisk/cdr cdr_odbc.c,1.7,1.8

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/cdr
In directory mongoose.digium.com:/tmp/cvs-serv24698

Modified Files:
	cdr_odbc.c 
Log Message:
prevent deadlock if no config file


Index: cdr_odbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/cdr_odbc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cdr_odbc.c	24 Dec 2003 03:05:03 -0000	1.7
+++ cdr_odbc.c	4 Jan 2004 05:11:53 -0000	1.8
@@ -241,7 +241,7 @@
 
 static int odbc_load_module(void)
 {
-	int res;
+	int res = 0;
 	struct ast_config *cfg;
 	struct ast_variable *var;
 	char *tmp;
@@ -252,13 +252,13 @@
 	if (!cfg)
 	{
 		ast_log(LOG_WARNING, "cdr_odbc: Unable to load config for ODBC CDR's: %s\n", config);
-		return 0;
+		goto out;
 	}
 	
 	var = ast_variable_browse(cfg, "global");
 	if (!var) {
 		/* nothing configured */
-		return 0;
+		goto out;
 	}
 
 	tmp = ast_variable_retrieve(cfg,"global","dsn");
@@ -368,6 +368,7 @@
 	{
 		ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
 	}
+out:
 	ast_mutex_unlock(&odbc_lock);
 	return res;
 }