georg Mon Jan 26 02:39:58 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c
Log:
more prototype fixes.
fixed a bug in mysqli_send_long_data
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.61&r2=1.62&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.61 php-src/ext/mysqli/mysqli_api.c:1.62
--- php-src/ext/mysqli/mysqli_api.c:1.61 Sun Jan 25 07:01:36 2004
+++ php-src/ext/mysqli/mysqli_api.c Mon Jan 26 02:39:57 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.61 2004/01/25 12:01:36 georg Exp $
+ $Id: mysqli_api.c,v 1.62 2004/01/26 07:39:57 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -29,7 +29,6 @@
#include "ext/standard/info.h"
#include "php_mysqli.h"
-
/* {{{ proto mixed mysqli_affected_rows(object link)
Get number of affected rows in previous MySQL operation */
PHP_FUNCTION(mysqli_affected_rows)
@@ -709,7 +708,7 @@
}
/* }}} */
-/* {{{ proto object mysqli_fetch_field (object result)
+/* {{{ proto mixed mysqli_fetch_field (object result)
Get column information from a result and return as an object */
PHP_FUNCTION(mysqli_fetch_field)
{
@@ -741,7 +740,7 @@
}
/* }}} */
-/* {{{ proto array mysqli_fetch_fields (object result)
+/* {{{ proto mixed mysqli_fetch_fields (object result)
Return array of objects containing field meta-data */
PHP_FUNCTION(mysqli_fetch_fields)
{
@@ -786,7 +785,7 @@
}
/* }}} */
-/* {{{ proto array mysqli_fetch_field_direct (object result, int offset)
+/* {{{ proto mixed mysqli_fetch_field_direct (object result, int offset)
Fetch meta-data for a single field */
PHP_FUNCTION(mysqli_fetch_field_direct)
{
@@ -819,7 +818,7 @@
}
/* }}} */
-/* {{{ proto array mysqli_fetch_lengths (object result)
+/* {{{ proto mixed mysqli_fetch_lengths (object result)
Get the length of each output in a result */
PHP_FUNCTION(mysqli_fetch_lengths)
{
@@ -1507,11 +1506,10 @@
}
MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt");
- if (!param_nr) {
+ if (param_nr < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter
number");
RETURN_FALSE;
}
- param_nr--;
if (mysql_send_long_data(stmt->stmt, param_nr, data, data_len)) {
RETURN_FALSE;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.27&r2=1.28&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.27 php-src/ext/mysqli/mysqli_nonapi.c:1.28
--- php-src/ext/mysqli/mysqli_nonapi.c:1.27 Sun Jan 11 19:34:37 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Jan 26 02:39:57 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.27 2004/01/12 00:34:37 helly Exp $
+ $Id: mysqli_nonapi.c,v 1.28 2004/01/26 07:39:57 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -163,7 +163,7 @@
}
/* }}} */
-/* {{{ proto array mysqli_fetch_array (object result [,int resulttype])
+/* {{{ proto mixed mysqli_fetch_array (object result [,int resulttype])
Fetch a result row as an associative array, a numeric array, or both */
PHP_FUNCTION(mysqli_fetch_array)
{
@@ -171,7 +171,7 @@
}
/* }}} */
-/* {{{ proto array mysqli_fetch_assoc (object result)
+/* {{{ proto mixed mysqli_fetch_assoc (object result)
Fetch a result row as an associative array */
PHP_FUNCTION(mysqli_fetch_assoc)
{
@@ -179,7 +179,7 @@
}
/* }}} */
-/* {{{ proto object mysqli_fetch_object (object result [, string class_name [,
NULL|array ctor_params]])
+/* {{{ proto mixed mysqli_fetch_object (object result [, string class_name [,
NULL|array ctor_params]])
Fetch a result row as an object */
PHP_FUNCTION(mysqli_fetch_object)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
