Skip to content

ext/mysqli: Mark function pointer as returning zend_result #15342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2024
Merged

ext/mysqli: Mark function pointer as returning zend_result #15342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ext/mysqli/mysqli_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@


/* {{{ 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;
}
/* }}} */

/* {{{ 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);
Expand All @@ -43,23 +43,23 @@ 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;
}
/* }}} */

/* {{{ 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;
}
/* }}} */

/* {{{ 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;
Expand Down
30 changes: 15 additions & 15 deletions ext/mysqli/mysqli_prop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;\
Expand All @@ -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;\
Expand All @@ -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;\
Expand All @@ -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;\
Expand All @@ -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);

Expand All @@ -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);

Expand All @@ -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));

Expand All @@ -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));
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ext/mysqli/mysqli_warning.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/php_mysqli_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading