Skip to content

Commit 1950d66

Browse files
GirgiasGirgias
authored
ext/mysqli: Mark function pointer as returning zend_result (#15342)
1 parent c4eccf3 commit 1950d66

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎ext/mysqli/mysqli_driver.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626

2727

2828
/* {{{ property driver_report_read */
29-
static int driver_report_read(mysqli_object *obj, zval *retval, bool quiet)
29+
static zend_result driver_report_read(mysqli_object *obj, zval *retval, bool quiet)
3030
{
3131
ZVAL_LONG(retval, MyG(report_mode));
3232
return SUCCESS;
3333
}
3434
/* }}} */
3535

3636
/* {{{ property driver_report_write */
37-
static int driver_report_write(mysqli_object *obj, zval *value)
37+
static zend_result driver_report_write(mysqli_object *obj, zval *value)
3838
{
3939
ZEND_ASSERT(Z_TYPE_P(value) == IS_LONG);
4040
MyG(report_mode) = Z_LVAL_P(value);
@@ -43,23 +43,23 @@ static int driver_report_write(mysqli_object *obj, zval *value)
4343
/* }}} */
4444

4545
/* {{{ property driver_client_version_read */
46-
static int driver_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
46+
static zend_result driver_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
4747
{
4848
ZVAL_LONG(retval, mysql_get_client_version());
4949
return SUCCESS;
5050
}
5151
/* }}} */
5252

5353
/* {{{ property driver_client_info_read */
54-
static int driver_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
54+
static zend_result driver_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
5555
{
5656
ZVAL_STRING(retval, (char *)mysql_get_client_info());
5757
return SUCCESS;
5858
}
5959
/* }}} */
6060

6161
/* {{{ property driver_driver_version_read */
62-
static int driver_driver_version_read(mysqli_object *obj, zval *retval, bool quiet)
62+
static zend_result driver_driver_version_read(mysqli_object *obj, zval *retval, bool quiet)
6363
{
6464
if (quiet) {
6565
return FAILURE;

‎ext/mysqli/mysqli_prop.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if (!obj->ptr) { \
7070
}
7171

7272
#define MYSQLI_MAP_PROPERTY_FUNC_LONG_OR_STR( __func, __int_func, __get_type, __ret_type, __ret_type_sprint_mod)\
73-
static int __func(mysqli_object *obj, zval *retval, bool quiet) \
73+
static zend_result __func(mysqli_object *obj, zval *retval, bool quiet) \
7474
{\
7575
__ret_type l;\
7676
__get_type;\
@@ -85,7 +85,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet) \
8585
}
8686

8787
#define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, __ret_type, __ret_type_sprint_mod)\
88-
static int __func(mysqli_object *obj, zval *retval, bool quiet) \
88+
static zend_result __func(mysqli_object *obj, zval *retval, bool quiet) \
8989
{\
9090
__ret_type l;\
9191
__get_type;\
@@ -97,7 +97,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet) \
9797
}
9898

9999
#define MYSQLI_MAP_PROPERTY_FUNC_STR_OR_NULL(__func, __int_func, __get_type)\
100-
static int __func(mysqli_object *obj, zval *retval, bool quiet)\
100+
static zend_result __func(mysqli_object *obj, zval *retval, bool quiet)\
101101
{\
102102
char *c;\
103103
__get_type;\
@@ -112,7 +112,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet)\
112112
}
113113

114114
#define MYSQLI_MAP_PROPERTY_FUNC_STR(__func, __int_func, __get_type)\
115-
static int __func(mysqli_object *obj, zval *retval, bool quiet)\
115+
static zend_result __func(mysqli_object *obj, zval *retval, bool quiet)\
116116
{\
117117
char *c;\
118118
__get_type;\
@@ -124,7 +124,7 @@ static int __func(mysqli_object *obj, zval *retval, bool quiet)\
124124
}
125125

126126
/* {{{ property link_client_version_read */
127-
static int link_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
127+
static zend_result link_client_version_read(mysqli_object *obj, zval *retval, bool quiet)
128128
{
129129
ZVAL_LONG(retval, MYSQL_VERSION_ID);
130130

@@ -133,7 +133,7 @@ static int link_client_version_read(mysqli_object *obj, zval *retval, bool quiet
133133
/* }}} */
134134

135135
/* {{{ property link_client_info_read */
136-
static int link_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
136+
static zend_result link_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
137137
{
138138
ZVAL_STRING(retval, MYSQL_SERVER_VERSION);
139139

@@ -142,7 +142,7 @@ static int link_client_info_read(mysqli_object *obj, zval *retval, bool quiet)
142142
/* }}} */
143143

144144
/* {{{ property link_connect_errno_read */
145-
static int link_connect_errno_read(mysqli_object *obj, zval *retval, bool quiet)
145+
static zend_result link_connect_errno_read(mysqli_object *obj, zval *retval, bool quiet)
146146
{
147147
ZVAL_LONG(retval, (zend_long)MyG(error_no));
148148

@@ -151,7 +151,7 @@ static int link_connect_errno_read(mysqli_object *obj, zval *retval, bool quiet)
151151
/* }}} */
152152

153153
/* {{{ property link_connect_error_read */
154-
static int link_connect_error_read(mysqli_object *obj, zval *retval, bool quiet)
154+
static zend_result link_connect_error_read(mysqli_object *obj, zval *retval, bool quiet)
155155
{
156156
if (MyG(error_msg)) {
157157
ZVAL_STRING(retval, MyG(error_msg));
@@ -164,7 +164,7 @@ static int link_connect_error_read(mysqli_object *obj, zval *retval, bool quiet)
164164
/* }}} */
165165

166166
/* {{{ property link_affected_rows_read */
167-
static int link_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
167+
static zend_result link_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
168168
{
169169
MY_MYSQL *mysql;
170170
my_ulonglong rc;
@@ -192,7 +192,7 @@ static int link_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
192192
/* }}} */
193193

194194
/* {{{ property link_error_list_read */
195-
static int link_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
195+
static zend_result link_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
196196
{
197197
MY_MYSQL *mysql;
198198

@@ -240,7 +240,7 @@ MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, MYSQ
240240
/* result properties */
241241

242242
/* {{{ property result_type_read */
243-
static int result_type_read(mysqli_object *obj, zval *retval, bool quiet)
243+
static zend_result result_type_read(mysqli_object *obj, zval *retval, bool quiet)
244244
{
245245
MYSQL_RES *p;
246246

@@ -255,7 +255,7 @@ static int result_type_read(mysqli_object *obj, zval *retval, bool quiet)
255255
/* }}} */
256256

257257
/* {{{ property result_lengths_read */
258-
static int result_lengths_read(mysqli_object *obj, zval *retval, bool quiet)
258+
static zend_result result_lengths_read(mysqli_object *obj, zval *retval, bool quiet)
259259
{
260260
MYSQL_RES *p;
261261
const size_t *ret;
@@ -287,7 +287,7 @@ MYSQLI_MAP_PROPERTY_FUNC_LONG_OR_STR(result_num_rows_read, mysql_num_rows, MYSQL
287287
/* statement properties */
288288

289289
/* {{{ property stmt_id_read */
290-
static int stmt_id_read(mysqli_object *obj, zval *retval, bool quiet)
290+
static zend_result stmt_id_read(mysqli_object *obj, zval *retval, bool quiet)
291291
{
292292
MY_STMT *p;
293293

@@ -303,7 +303,7 @@ static int stmt_id_read(mysqli_object *obj, zval *retval, bool quiet)
303303
/* }}} */
304304

305305
/* {{{ property stmt_affected_rows_read */
306-
static int stmt_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
306+
static zend_result stmt_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
307307
{
308308
MY_STMT *p;
309309
my_ulonglong rc;
@@ -331,7 +331,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval *retval, bool quiet)
331331
/* }}} */
332332

333333
/* {{{ property stmt_error_list_read */
334-
static int stmt_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
334+
static zend_result stmt_error_list_read(mysqli_object *obj, zval *retval, bool quiet)
335335
{
336336
MY_STMT * stmt;
337337

‎ext/mysqli/mysqli_warning.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ PHP_METHOD(mysqli_warning, next)
145145
/* }}} */
146146

147147
/* {{{ property mysqli_warning_message */
148-
static int mysqli_warning_message(mysqli_object *obj, zval *retval, bool quiet)
148+
static zend_result mysqli_warning_message(mysqli_object *obj, zval *retval, bool quiet)
149149
{
150150
MYSQLI_WARNING *w;
151151

@@ -165,7 +165,7 @@ static int mysqli_warning_message(mysqli_object *obj, zval *retval, bool quiet)
165165
/* }}} */
166166

167167
/* {{{ property mysqli_warning_sqlstate */
168-
static int mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, bool quiet)
168+
static zend_result mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, bool quiet)
169169
{
170170
MYSQLI_WARNING *w;
171171

@@ -185,7 +185,7 @@ static int mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, bool quiet)
185185
/* }}} */
186186

187187
/* {{{ property mysqli_warning_error */
188-
static int mysqli_warning_errno(mysqli_object *obj, zval *retval, bool quiet)
188+
static zend_result mysqli_warning_errno(mysqli_object *obj, zval *retval, bool quiet)
189189
{
190190
MYSQLI_WARNING *w;
191191

‎ext/mysqli/php_mysqli_structs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ struct st_mysqli_warning {
9999
typedef struct _mysqli_property_entry {
100100
const char *pname;
101101
size_t pname_length;
102-
int (*r_func)(mysqli_object *obj, zval *retval, bool quiet);
103-
int (*w_func)(mysqli_object *obj, zval *value);
102+
zend_result (*r_func)(mysqli_object *obj, zval *retval, bool quiet);
103+
zend_result (*w_func)(mysqli_object *obj, zval *value);
104104
} mysqli_property_entry;
105105

106106
typedef struct {

0 commit comments

Comments
 (0)