From 7f46f9bec733e07fdc13ea0acb01ba3c130f5e9e Mon Sep 17 00:00:00 2001 From: Gina Peter Bnayard Date: Sun, 11 Aug 2024 16:11:42 +0200 Subject: [PATCH 1/2] ext/mysqli: Mark return type as zend_return --- ext/mysqli/mysqli.c | 2 +- ext/mysqli/mysqli_nonapi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 438552335e090..825c51146d667 100644 --- 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 index 1e053729d8de5..425f543d630c0 100644 --- 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; From bf6bbefca0b24fbd9e2d26fa5bfb7ff5c56ac3d3 Mon Sep 17 00:00:00 2001 From: Gina Peter Bnayard Date: Sun, 11 Aug 2024 17:29:15 +0200 Subject: [PATCH 2/2] Fix typedefs --- ext/mysqli/mysqli.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 825c51146d667..987183aa9dcb0 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -71,8 +71,8 @@ zend_class_entry *mysqli_warning_class_entry; zend_class_entry *mysqli_exception_class_entry; -typedef int (*mysqli_read_t)(mysqli_object *obj, zval *rv, bool quiet); -typedef int (*mysqli_write_t)(mysqli_object *obj, zval *newval); +typedef zend_result (*mysqli_read_t)(mysqli_object *obj, zval *rv, bool quiet); +typedef zend_result (*mysqli_write_t)(mysqli_object *obj, zval *newval); typedef struct _mysqli_prop_handler { zend_string *name;