tony2001 Mon Oct 10 16:14:33 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli.c mysqli_warning.c
Log:
MF51: fix #34818
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.74&r2=1.75&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.74 php-src/ext/mysqli/mysqli.c:1.75
--- php-src/ext/mysqli/mysqli.c:1.74 Tue Sep 13 05:19:58 2005
+++ php-src/ext/mysqli/mysqli.c Mon Oct 10 16:14:31 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.74 2005/09/13 09:19:58 tony2001 Exp $
+ $Id: mysqli.c,v 1.75 2005/10/10 20:14:31 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -654,33 +654,34 @@
ZEND_FUNCTION(mysqli_stmt_construct)
{
MY_MYSQL *mysql;
- zval **mysql_link, **statement;
+ zval *mysql_link;
MY_STMT *stmt;
MYSQLI_RESOURCE *mysqli_resource;
+ char *statement;
+ int stmt_len;
switch (ZEND_NUM_ARGS())
{
case 1: /* mysql_stmt_init */
- if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) {
+ if (zend_parse_parameters(1, "O", &mysql_link,
mysqli_link_class_entry)==FAILURE) {
return;
}
- MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link,
"mysqli_link");
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link,
"mysqli_link");
stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT));
stmt->stmt = mysql_stmt_init(mysql->mysql);
break;
case 2:
- if (zend_get_parameters_ex(2, &mysql_link,
&statement)==FAILURE) {
+ if (zend_parse_parameters(2, "Os", &mysql_link,
mysqli_link_class_entry, &statement, stmt_len)==FAILURE) {
return;
}
- MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link,
"mysqli_link");
- convert_to_string_ex(statement);
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link,
"mysqli_link");
stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT));
if ((stmt->stmt = mysql_stmt_init(mysql->mysql))) {
- mysql_stmt_prepare(stmt->stmt,
Z_STRVAL_PP(statement), strlen(Z_STRVAL_PP(statement)));
+ mysql_stmt_prepare(stmt->stmt, statement,
stmt_len);
}
break;
default:
@@ -710,27 +711,26 @@
{
MY_MYSQL *mysql;
MYSQL_RES *result;
- zval **mysql_link, **mode;
+ zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource;
- int resmode = MYSQLI_STORE_RESULT;
+ long resmode = MYSQLI_STORE_RESULT;
switch (ZEND_NUM_ARGS()) {
case 1:
- if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) {
+ if (zend_parse_parameters(1, "O", &mysql_link,
mysqli_link_class_entry)==FAILURE) {
return;
}
break;
case 2:
- if (zend_get_parameters_ex(2, &mysql_link, &mode)==FAILURE) {
+ if (zend_parse_parameters(2, "Ol", &mysql_link,
mysqli_link_class_entry, &resmode)==FAILURE) {
return;
}
- resmode = Z_LVAL_PP(mode);
break;
default:
WRONG_PARAM_COUNT;
}
- MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, "mysqli_link");
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link");
result = (resmode == MYSQLI_STORE_RESULT) ?
mysql_store_result(mysql->mysql) :
mysql_use_result(mysql->mysql);
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_warning.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/mysqli/mysqli_warning.c
diff -u php-src/ext/mysqli/mysqli_warning.c:1.6
php-src/ext/mysqli/mysqli_warning.c:1.7
--- php-src/ext/mysqli/mysqli_warning.c:1.6 Mon Oct 10 08:59:47 2005
+++ php-src/ext/mysqli/mysqli_warning.c Mon Oct 10 16:14:31 2005
@@ -166,7 +166,7 @@
/* {{{ mysqli_warning_construct(object obj) */
PHP_METHOD(mysqli_warning, __construct)
{
- zval **z;
+ zval *z;
mysqli_object *obj;
MYSQL *hdl;
MYSQLI_WARNING *w;
@@ -175,18 +175,18 @@
if (ZEND_NUM_ARGS() != 1) {
WRONG_PARAM_COUNT;
}
- if (zend_get_parameters_ex(1, &z)==FAILURE) {
+ if (zend_parse_parameters(1, "o", &z)==FAILURE) {
return;
}
- obj = (mysqli_object *)zend_object_store_get_object(*(z) TSRMLS_CC);\
+ obj = (mysqli_object *)zend_object_store_get_object(z TSRMLS_CC);\
if (obj->zo.ce == mysqli_link_class_entry) {
MY_MYSQL *mysql;
- MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, z, "mysqli_link");
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &z, "mysqli_link");
hdl = mysql->mysql;
} else if (obj->zo.ce == mysqli_stmt_class_entry) {
MY_STMT *stmt;
- MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, z, "mysqli_stmt");
+ MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &z, "mysqli_stmt");
hdl = stmt->stmt->mysql;
} else {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
