From 818a6fe5f63ed2dd815703612383cc1fcf3d06de Mon Sep 17 00:00:00 2001
From: Gina Peter Bnayard <girgias@php.net>
Date: Sun, 11 Aug 2024 15:44:33 +0200
Subject: [PATCH] ext/mysqli: Mark function pointer as returning zend_result

---
 ext/mysqli/mysqli_driver.c      | 10 +++++-----
 ext/mysqli/mysqli_prop.c        | 30 +++++++++++++++---------------
 ext/mysqli/mysqli_warning.c     |  6 +++---
 ext/mysqli/php_mysqli_structs.h |  4 ++--
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
index b6ee92f4357a4..d2c94d881b44b 100644
--- a/ext/mysqli/mysqli_driver.c
+++ b/ext/mysqli/mysqli_driver.c
@@ -26,7 +26,7 @@
 
 
 /* {{{ property driver_report_read */
-static int driver_report_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result driver_report_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	ZVAL_LONG(retval, MyG(report_mode));
 	return SUCCESS;
@@ -34,7 +34,7 @@ static int driver_report_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property driver_report_write */
-static int driver_report_write(mysqli_object *obj, zval *value)
+static zend_result driver_report_write(mysqli_object *obj, zval *value)
 {
 	ZEND_ASSERT(Z_TYPE_P(value) == IS_LONG);
 	MyG(report_mode) = Z_LVAL_P(value);
@@ -43,7 +43,7 @@ static int driver_report_write(mysqli_object *obj, zval *value)
 /* }}} */
 
 /* {{{ property driver_client_version_read */
-static int driver_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result driver_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	ZVAL_LONG(retval, mysql_get_client_version());
 	return SUCCESS;
@@ -51,7 +51,7 @@ static int driver_client_version_read(mysqli_object *obj, zval *retval, bool qui
 /* }}} */
 
 /* {{{ property driver_client_info_read */
-static int driver_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result driver_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	ZVAL_STRING(retval, (char *)mysql_get_client_info());
 	return SUCCESS;
@@ -59,7 +59,7 @@ static int driver_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property driver_driver_version_read */
-static int driver_driver_version_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result driver_driver_version_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	if (quiet) {
 		return FAILURE;
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index fe44733cd9bc5..6d86a6ad4ca8b 100644
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -70,7 +70,7 @@ if (!obj->ptr) { \
 }
 
 #define MYSQLI_MAP_PROPERTY_FUNC_LONG_OR_STR( __func, __int_func, __get_type, __ret_type, __ret_type_sprint_mod)\
-static int __func(mysqli_object *obj, zval *retval, bool quiet) \
+static zend_result __func(mysqli_object *obj, zval *retval, bool quiet) \
 {\
 	__ret_type l;\
 	__get_type;\
@@ -85,7 +85,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet) \
 }
 
 #define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, __ret_type, __ret_type_sprint_mod)\
-static int __func(mysqli_object *obj, zval *retval, bool quiet) \
+static zend_result __func(mysqli_object *obj, zval *retval, bool quiet) \
 {\
 	__ret_type l;\
 	__get_type;\
@@ -97,7 +97,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet) \
 }
 
 #define MYSQLI_MAP_PROPERTY_FUNC_STR_OR_NULL(__func, __int_func, __get_type)\
-static int __func(mysqli_object *obj, zval *retval, bool quiet)\
+static zend_result __func(mysqli_object *obj, zval *retval, bool quiet)\
 {\
 	char *c;\
 	__get_type;\
@@ -112,7 +112,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet)\
 }
 
 #define MYSQLI_MAP_PROPERTY_FUNC_STR(__func, __int_func, __get_type)\
-static int __func(mysqli_object *obj, zval *retval, bool quiet)\
+static zend_result __func(mysqli_object *obj, zval *retval, bool quiet)\
 {\
 	char *c;\
 	__get_type;\
@@ -124,7 +124,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet)\
 }
 
 /* {{{ property link_client_version_read */
-static int link_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result link_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	ZVAL_LONG(retval, MYSQL_VERSION_ID);
 
@@ -133,7 +133,7 @@ static int link_client_version_read(mysqli_object *obj, zval *retval, bool quiet
 /* }}} */
 
 /* {{{ property link_client_info_read */
-static int link_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result link_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	ZVAL_STRING(retval, MYSQL_SERVER_VERSION);
 
@@ -142,7 +142,7 @@ static int link_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property link_connect_errno_read */
-static int link_connect_errno_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result link_connect_errno_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	ZVAL_LONG(retval, (zend_long)MyG(error_no));
 
@@ -151,7 +151,7 @@ static int link_connect_errno_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property link_connect_error_read */
-static int link_connect_error_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result link_connect_error_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	if (MyG(error_msg)) {
 		ZVAL_STRING(retval, MyG(error_msg));
@@ -164,7 +164,7 @@ static int link_connect_error_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property link_affected_rows_read */
-static int link_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result link_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MY_MYSQL *mysql;
 	my_ulonglong rc;
@@ -192,7 +192,7 @@ static int link_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property link_error_list_read */
-static int link_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result link_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MY_MYSQL *mysql;
 
@@ -240,7 +240,7 @@ MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, MYSQ
 /* result properties */
 
 /* {{{ property result_type_read */
-static int result_type_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result result_type_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MYSQL_RES *p;
 
@@ -255,7 +255,7 @@ static int result_type_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property result_lengths_read */
-static int result_lengths_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result result_lengths_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MYSQL_RES *p;
 	const size_t *ret;
@@ -287,7 +287,7 @@ MYSQLI_MAP_PROPERTY_FUNC_LONG_OR_STR(result_num_rows_read, mysql_num_rows, MYSQL
 /* statement properties */
 
 /* {{{ property stmt_id_read */
-static int stmt_id_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result stmt_id_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MY_STMT *p;
 
@@ -303,7 +303,7 @@ static int stmt_id_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property stmt_affected_rows_read */
-static int stmt_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result stmt_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MY_STMT *p;
 	my_ulonglong rc;
@@ -331,7 +331,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property stmt_error_list_read */
-static int stmt_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result stmt_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MY_STMT * stmt;
 
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
index 58fddcb0b34a2..3791e48465346 100644
--- a/ext/mysqli/mysqli_warning.c
+++ b/ext/mysqli/mysqli_warning.c
@@ -145,7 +145,7 @@ PHP_METHOD(mysqli_warning, next)
 /* }}} */
 
 /* {{{ property mysqli_warning_message */
-static int mysqli_warning_message(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result mysqli_warning_message(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MYSQLI_WARNING *w;
 
@@ -165,7 +165,7 @@ static int mysqli_warning_message(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property mysqli_warning_sqlstate */
-static int mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MYSQLI_WARNING *w;
 
@@ -185,7 +185,7 @@ static int mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, bool quiet)
 /* }}} */
 
 /* {{{ property mysqli_warning_error */
-static int mysqli_warning_errno(mysqli_object *obj, zval *retval, bool quiet)
+static zend_result mysqli_warning_errno(mysqli_object *obj, zval *retval, bool quiet)
 {
 	MYSQLI_WARNING *w;
 
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 7495cc8bda733..c155281c8e4bc 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -99,8 +99,8 @@ struct st_mysqli_warning {
 typedef struct _mysqli_property_entry {
 	const char *pname;
 	size_t pname_length;
-	int (*r_func)(mysqli_object *obj, zval *retval, bool quiet);
-	int (*w_func)(mysqli_object *obj, zval *value);
+	zend_result (*r_func)(mysqli_object *obj, zval *retval, bool quiet);
+	zend_result (*w_func)(mysqli_object *obj, zval *value);
 } mysqli_property_entry;
 
 typedef struct {