[asterisk-commits] file: branch 1.6.0 r111962 - in /branches/1.6.0: ./ res/res_config_sqlite.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Mar 31 09:22:27 2008
New Revision: 111962

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111962
Log:
Merged revisions 111961 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r111961 | file | 2008-03-31 11:20:39 -0300 (Mon, 31 Mar 2008) | 4 lines

Initialize all these here tmp pointers at declaration. They confused some compilers a wee bit.
(closes issue #12333)
Reported by: ovi

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_config_sqlite.c

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

Modified: branches/1.6.0/res/res_config_sqlite.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_config_sqlite.c?view=diff&rev=111962&r1=111961&r2=111962
==============================================================================
--- branches/1.6.0/res/res_config_sqlite.c (original)
+++ branches/1.6.0/res/res_config_sqlite.c Mon Mar 31 09:22:27 2008
@@ -1204,8 +1204,9 @@
 	return rows_num;
 }
 
-static int realtime_store_handler(const char *database, const char *table, va_list ap) {
-	char *errormsg, *tmp_str, *tmp_keys, *tmp_keys2, *tmp_vals, *tmp_vals2;
+static int realtime_store_handler(const char *database, const char *table, va_list ap)
+{
+	char *errormsg, *tmp_str, *tmp_keys = NULL, *tmp_keys2 = NULL, *tmp_vals = NULL, *tmp_vals2 = NULL;
 	const char **params, **vals;
 	size_t params_count;
 	int error, rows_id;
@@ -1224,8 +1225,6 @@
 #define QUERY "INSERT into '%q' (%s) VALUES (%s);"
 /* \endcond */
 
-	tmp_keys2 = NULL;
-	tmp_vals2 = NULL;
 	for (i = 0; i < params_count; i++) {
 		if ( tmp_keys2 ) {
 			tmp_keys = sqlite_mprintf("%s, %q", tmp_keys2, params[i]);