Skip to content

Commit 857ce2c

Browse files
authored
ext/mysqli: Mark return type as zend_return (#15345)
1 parent bb35da3 commit 857ce2c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/mysqli/mysqli.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ zend_class_entry *mysqli_warning_class_entry;
7171
zend_class_entry *mysqli_exception_class_entry;
7272

7373

74-
typedef int (*mysqli_read_t)(mysqli_object *obj, zval *rv, bool quiet);
75-
typedef int (*mysqli_write_t)(mysqli_object *obj, zval *newval);
74+
typedef zend_result (*mysqli_read_t)(mysqli_object *obj, zval *rv, bool quiet);
75+
typedef zend_result (*mysqli_write_t)(mysqli_object *obj, zval *newval);
7676

7777
typedef struct _mysqli_prop_handler {
7878
zend_string *name;
@@ -227,7 +227,7 @@ static void mysqli_warning_free_storage(zend_object *object)
227227
/* }}} */
228228

229229
/* {{{ 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)
231231
{
232232
if (!quiet) {
233233
zend_throw_error(NULL, "Cannot read property");

ext/mysqli/mysqli_nonapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ PHP_FUNCTION(mysqli_query)
635635

636636
#include "php_network.h"
637637
/* {{{ 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)
639639
{
640640
zval *elem;
641641
int i = 0, current = 0;

0 commit comments

Comments
 (0)