[svn-commits] tilghman: branch 1.6.1 r712 - in /branches/1.6.1: ./ res/res_config_mysql.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Dec 15 18:00:48 2008
New Revision: 712

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=712
Log:
Merged revisions 711 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

........
  r711 | tilghman | 2008-12-15 17:54:39 -0600 (Mon, 15 Dec 2008) | 2 lines
  
  Convert addons to use ast_str opacity, fixing some bugs along the way.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_config_mysql.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Dec 15 18:00:48 2008
@@ -1,1 +1,1 @@
-/trunk:1-690,707
+/trunk:1-690,707,711

Modified: branches/1.6.1/res/res_config_mysql.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.1/res/res_config_mysql.c?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- branches/1.6.1/res/res_config_mysql.c (original)
+++ branches/1.6.1/res/res_config_mysql.c Mon Dec 15 18:00:48 2008
@@ -600,7 +600,7 @@
 
 	/* If the column length isn't long enough, give a chance to lengthen it. */
 	if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
-		internal_require(database, tablename, newparam, RQ_CHAR, buf->used, SENTINEL);
+		internal_require(database, tablename, newparam, RQ_CHAR, valsz, SENTINEL);
 	}
 
 	while ((newparam = va_arg(ap, const char *))) {
@@ -618,7 +618,7 @@
 
 		/* If the column length isn't long enough, give a chance to lengthen it. */
 		if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
-			internal_require(database, tablename, newparam, RQ_CHAR, buf->used, SENTINEL);
+			internal_require(database, tablename, newparam, RQ_CHAR, valsz, SENTINEL);
 		}
 	}
 	va_end(ap);