[svn-commits] tilghman: branch 1.6.1 r149641 - in /branches/1.6.1: ./ funcs/func_odbc.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Oct 15 12:16:59 2008
New Revision: 149641

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

........
  r149640 | tilghman | 2008-10-15 12:16:00 -0500 (Wed, 15 Oct 2008) | 2 lines
  
  Only set buf to blank before the goto.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_odbc.c

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

Modified: branches/1.6.1/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/funcs/func_odbc.c?view=diff&rev=149641&r1=149640&r2=149641
==============================================================================
--- branches/1.6.1/funcs/func_odbc.c (original)
+++ branches/1.6.1/funcs/func_odbc.c Wed Oct 15 12:16:59 2008
@@ -450,6 +450,7 @@
 			if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
 				ast_log(LOG_WARNING, "SQL Get Data error!\n[%s]\n\n", sql->str);
 				y = -1;
+				buf[0] = '\0';
 				goto end_acf_read;
 			}
 
@@ -518,8 +519,6 @@
 		}
 		odbc_store->data = resultset;
 		ast_channel_datastore_add(chan, odbc_store);
-	} else {
-		buf[0] = '\0';
 	}
 	SQLCloseCursor(stmt);
 	SQLFreeHandle(SQL_HANDLE_STMT, stmt);