andrey Tue, 18 May 2010 16:35:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299457
Log:
And I thought I fixed that...
Part of the previous changeset - remove duplicated code/
The ifdefs were for debug purposes.
Changed paths:
U php/php-src/trunk/ext/mysql/php_mysql.c
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2010-05-18 15:18:32 UTC (rev
299456)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-05-18 16:35:17 UTC (rev
299457)
@@ -2071,19 +2071,7 @@
Gets a result row as an enumerated array */
PHP_FUNCTION(mysql_fetch_row)
{
-#if 1
- MYSQL_RES *result;
- zval *mysql_result;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
&mysql_result) == FAILURE) {
- return;
- }
- ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL
result", le_result);
-
- mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, return_value,
MYSQLND_MYSQL);
-#else
php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_NUM, 1, 0);
-#endif
}
/* }}} */
@@ -2105,25 +2093,7 @@
Fetch a result row as an array (associative, numeric or both) */
PHP_FUNCTION(mysql_fetch_array)
{
-#if 1
php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 2, 0);
-#else
- MYSQL_RES *result;
- zval *mysql_result;
- long mode = MYSQLND_FETCH_BOTH;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l",
&mysql_result, &mode) == FAILURE) {
- return;
- }
- ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL
result", le_result);
-
- if (mode & ~MYSQL_BOTH) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type
should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH");
- mode = MYSQL_BOTH;
- }
-
- mysqlnd_fetch_into(result, mode, return_value, MYSQLND_MYSQL);
-#endif
}
/* }}} */
@@ -2132,19 +2102,7 @@
Fetch a result row as an associative array */
PHP_FUNCTION(mysql_fetch_assoc)
{
-#if 1
php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 1,
0);
-#else
- MYSQL_RES *result;
- zval *mysql_result;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
&mysql_result) == FAILURE) {
- return;
- }
- ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL
result", le_result);
-
- mysqlnd_fetch_into(result, MYSQLND_FETCH_ASSOC, return_value,
MYSQLND_MYSQL);
-#endif
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
