georg Mon Jan 26 08:38:14 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c mysqli_api.c
Log:
proto fixes
removed mysqli_read_query_result (will be removed in libmysql)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.25&r2=1.26&ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.25 php-src/ext/mysqli/mysqli_fe.c:1.26
--- php-src/ext/mysqli/mysqli_fe.c:1.25 Thu Jan 8 12:32:31 2004
+++ php-src/ext/mysqli/mysqli_fe.c Mon Jan 26 08:38:13 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.25 2004/01/08 17:32:31 sniper Exp $
+ $Id: mysqli_fe.c,v 1.26 2004/01/26 13:38:13 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -106,7 +106,6 @@
PHP_FE(mysqli_prepare,
NULL)
PHP_FE(mysqli_report,
NULL)
PHP_FE(mysqli_query,
NULL)
- PHP_FE(mysqli_read_query_result, NULL)
PHP_FE(mysqli_real_connect,
NULL)
PHP_FE(mysqli_real_escape_string, NULL)
PHP_FALIAS(mysqli_escape_string,
@@ -182,7 +181,6 @@
PHP_FALIAS(ping,mysqli_ping,NULL)
PHP_FALIAS(prepare,mysqli_prepare,NULL)
PHP_FALIAS(query,mysqli_query,NULL)
- PHP_FALIAS(read_query_result,mysqli_read_query_result,NULL)
PHP_FALIAS(real_connect,mysqli_real_connect,NULL)
PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL)
PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.62&r2=1.63&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.62 php-src/ext/mysqli/mysqli_api.c:1.63
--- php-src/ext/mysqli/mysqli_api.c:1.62 Mon Jan 26 02:39:57 2004
+++ php-src/ext/mysqli/mysqli_api.c Mon Jan 26 08:38:13 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.62 2004/01/26 07:39:57 georg Exp $
+ $Id: mysqli_api.c,v 1.63 2004/01/26 13:38:13 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1286,26 +1286,6 @@
}
/* }}} */
-/* {{{ proto bool mysqli_read_query_result(object link)
-*/
-PHP_FUNCTION(mysqli_read_query_result)
-{
- MYSQL *mysql;
- zval *mysql_link;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_link, mysqli_link_class_entry) == FAILURE) {
- return;
- }
- MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
-
- if (mysql_read_query_result(mysql)) {
- RETURN_FALSE;
- }
-
- RETURN_TRUE;
-}
-/* }}} */
-
/* {{{ proto bool mysqli_real_connect(object link [,string hostname [,string username
[,string passwd [,string dbname [,int port [,string socket [,int flags]]]]]]])
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_real_connect)
@@ -1732,19 +1712,23 @@
}
/* }}} */
-/* {{{ proto string mysqli_stat(object link)
+/* {{{ proto mixed mysqli_stat(object link)
Get current system status */
PHP_FUNCTION(mysqli_stat)
{
MYSQL *mysql;
zval *mysql_link;
+ char *stat;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_link, mysqli_link_class_entry) == FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
- RETURN_STRING((char *)mysql_stat(mysql), 1);
+ if (stat = (char *)mysql_stat(mysql)) {
+ RETURN_STRING(stat, 1);
+ }
+ RETURN_FALSE;
}
/* }}} */
@@ -1781,7 +1765,7 @@
}
/* }}} */
-/* {{{ proto object mysqli_stmt_store_result(stmt)
+/* {{{ proto bool mysqli_stmt_store_result(stmt)
*/
PHP_FUNCTION(mysqli_stmt_store_result)
{
@@ -1873,7 +1857,7 @@
/* }}} */
-/* {{{ proto object mysqli_use_result(object link)
+/* {{{ proto mixed mysqli_use_result(object link)
Directly retrieve query results - do not buffer results on client side */
PHP_FUNCTION(mysqli_use_result)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
