From: Georg Richter <georg@php.net>
Date: Mon, 26 Jan 2004 07:39:57 +0000 (+0000)
Subject: more prototype fixes.
X-Git-Tag: php-5.0.0b4RC1~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85510ff3a1ed77cb3db1b904ef50f76d2d608020;p=php

more prototype fixes.
fixed a bug in mysqli_send_long_data
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 550e1bc9bf..b4b30a88f3 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -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 @@ PHP_FUNCTION(mysqli_fetch)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(mysqli_fetch_field)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(mysqli_fetch_fields)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(mysqli_send_long_data)
 	}
 	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;
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index acb31d4091..65c71589d2 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -163,7 +163,7 @@ PHP_FUNCTION(mysqli_connect_error)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(mysqli_fetch_array)
 }
 /* }}} */
 
-/* {{{ 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 @@ PHP_FUNCTION(mysqli_fetch_assoc)
 }
 /* }}} */
 
-/* {{{ 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) 
 {