ext/mysqli: Mark return type as zend_return

Girgias · Girgias · commit b08a1ddb7770 · 2024-08-11T16:47:38.000+02:00
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -227,7 +227,7 @@ static void mysqli_warning_free_storage(zend_object *object)
 /* }}} */
 
 /* {{{ mysqli_read_na */
-static int mysqli_read_na(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result mysqli_read_na(mysqli_object *obj, zval *retval, bool quiet)
 {
 	if (!quiet) {
 		zend_throw_error(NULL, "Cannot read property");
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
@@ -635,7 +635,7 @@ PHP_FUNCTION(mysqli_query)
 
 #include "php_network.h"
 /* {{{ mysqlnd_zval_array_to_mysqlnd_array functions */
-static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_array)
+static zend_result mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_array)
 {
 	zval *elem;
 	int i = 0, current = 0;

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ static void mysqli_warning_free_storage(zend_object *object)`
`227`	`227`	`/* }}} */`
`228`	`228`
`229`	`229`	`/* {{{ mysqli_read_na */`
`230`		`-static int mysqli_read_na(mysqli_object obj, zval retval, bool quiet)`
	`230`	`+static zend_result mysqli_read_na(mysqli_object obj, zval retval, bool quiet)`
`231`	`231`	`{`
`232`	`232`	`if (!quiet) {`
`233`	`233`	`zend_throw_error(NULL, "Cannot read property");`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ PHP_FUNCTION(mysqli_query)`
`635`	`635`
`636`	`636`	`#include "php_network.h"`
`637`	`637`	`/* {{{ mysqlnd_zval_array_to_mysqlnd_array functions */`
`638`		`-static int mysqlnd_zval_array_to_mysqlnd_array(zval in_array, MYSQLND **out_array)`
	`638`	`+static zend_result mysqlnd_zval_array_to_mysqlnd_array(zval in_array, MYSQLND **out_array)`
`639`	`639`	`{`
`640`	`640`	`zval *elem;`
`641`	`641`	`int i = 0, current = 0;`