PHP mysqlnd svn commit: r1159 - in trunk: mysqlnd php5/ext/mysqli php6/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-11-28 11:43:14 +0100 (Wed, 28 Nov 2007)
New Revision: 1159

Modified:
   trunk/mysqlnd/mysqlnd_ps.c
   trunk/mysqlnd/mysqlnd_result.c
   trunk/php5/ext/mysqli/mysqli_api.c
   trunk/php6/ext/mysqli/mysqli_api.c
Log:
Switch to free instead of efree..Needed for another project


Modified: trunk/mysqlnd/mysqlnd_ps.c
===================================================================
--- trunk/mysqlnd/mysqlnd_ps.c	2007-11-27 12:25:03 UTC (rev 1158)
+++ trunk/mysqlnd/mysqlnd_ps.c	2007-11-28 10:43:14 UTC (rev 1159)
@@ -1121,7 +1121,7 @@
 					stmt->param_bind[i].zv = NULL;
 				}
 			}
-			mnd_efree(stmt->param_bind);
+			mnd_free(stmt->param_bind);
 		}
 
 		stmt->param_bind = param_bind;
@@ -1529,7 +1529,7 @@
 			}
 		}
 
-		mnd_efree(stmt->param_bind);
+		mnd_free(stmt->param_bind);
 		stmt->param_bind = NULL;
 	}
 
@@ -1632,7 +1632,7 @@
 {
 	enum_func_status ret;
 
-	DBG_ENTER("mysqlnd_stmt::close");
+	DBG_ENTER("mysqlnd_stmt::dtor");
 	DBG_INF_FMT("stmt=%p", stmt);
 
 	MYSQLND_INC_GLOBAL_STATISTIC(implicit == TRUE?	STAT_STMT_CLOSE_IMPLICIT:

Modified: trunk/mysqlnd/mysqlnd_result.c
===================================================================
--- trunk/mysqlnd/mysqlnd_result.c	2007-11-27 12:25:03 UTC (rev 1158)
+++ trunk/mysqlnd/mysqlnd_result.c	2007-11-28 10:43:14 UTC (rev 1159)
@@ -752,6 +752,7 @@
 }
 /* }}} */
 
+
 /* {{{ mysqlnd_fetch_row_buffered_c */
 static MYSQLND_ROW_C
 mysqlnd_fetch_row_buffered_c(MYSQLND_RES *result TSRMLS_DC)

Modified: trunk/php5/ext/mysqli/mysqli_api.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli_api.c	2007-11-27 12:25:03 UTC (rev 1158)
+++ trunk/php5/ext/mysqli/mysqli_api.c	2007-11-28 10:43:14 UTC (rev 1159)
@@ -166,7 +166,7 @@
 	if (argc == start) {
 		return PASS;
 	}
-	params = emalloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
+	params = malloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
 	for (i = 0; i < (argc - start); i++) {
 		zend_uchar type;
 		switch (types[i]) {
@@ -190,7 +190,7 @@
 				/* We count parameters from 1 */
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %c (parameter %d)",
types[i], i + start + 1);
 				ret = FAIL;
-				efree(params);
+				free(params);
 				goto end;
 		}
 		params[i].zv = *(args[i + start]);

Modified: trunk/php6/ext/mysqli/mysqli_api.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli_api.c	2007-11-27 12:25:03 UTC (rev 1158)
+++ trunk/php6/ext/mysqli/mysqli_api.c	2007-11-28 10:43:14 UTC (rev 1159)
@@ -166,7 +166,7 @@
 	if (argc == start) {
 		return PASS;
 	}
-	params = emalloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
+	params = malloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
 	for (i = 0; i < (argc - start); i++) {
 		zend_uchar type;
 		switch (types[i]) {
@@ -190,7 +190,7 @@
 				/* We count parameters from 1 */
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %c (parameter %d)",
types[i], i + start + 1);
 				ret = FAIL;
-				efree(params);
+				free(params);
 				goto end;
 		}
 		params[i].zv = *(args[i + start]);