Skip to content

Commit c517d6d

Browse files
weltlingweltling
committed
ported ext/mysqli
1 parent bdbf47d commit c517d6d

8 files changed

+108
-108
lines changed

‎ext/mysqli/mysqli.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
884884
#ifndef MYSQLI_USE_MYSQLND
885885
#if MYSQL_VERSION_ID >= 40000
886886
#ifdef PHP_WIN32
887-
unsigned long client_ver = mysql_get_client_version();
887+
php_uint_t client_ver = mysql_get_client_version();
888888
/*
889889
Can't call mysql_server_end() multiple times prior to 5.0.46 on Windows.
890890
PHP bug#41350 MySQL bug#25621
@@ -1105,7 +1105,7 @@ PHP_FUNCTION(mysqli_result_construct)
11051105
MYSQL_RES *result = NULL;
11061106
zval *mysql_link;
11071107
MYSQLI_RESOURCE *mysqli_resource;
1108-
long resmode = MYSQLI_STORE_RESULT;
1108+
php_int_t resmode = MYSQLI_STORE_RESULT;
11091109

11101110
switch (ZEND_NUM_ARGS()) {
11111111
case 1:
@@ -1114,7 +1114,7 @@ PHP_FUNCTION(mysqli_result_construct)
11141114
}
11151115
break;
11161116
case 2:
1117-
if (zend_parse_parameters(2 TSRMLS_CC, "Ol", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) {
1117+
if (zend_parse_parameters(2 TSRMLS_CC, "Oi", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) {
11181118
return;
11191119
}
11201120
break;
@@ -1149,13 +1149,13 @@ PHP_FUNCTION(mysqli_result_construct)
11491149

11501150
/* {{{ php_mysqli_fetch_into_hash_aux
11511151
*/
1152-
void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long fetchtype TSRMLS_DC)
1152+
void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, php_int_t fetchtype TSRMLS_DC)
11531153
{
11541154
#if !defined(MYSQLI_USE_MYSQLND)
11551155
MYSQL_ROW row;
11561156
unsigned int i;
11571157
MYSQL_FIELD *fields;
1158-
unsigned long *field_len;
1158+
php_uint_t *field_len;
11591159

11601160
if (!(row = mysql_fetch_row(result))) {
11611161
RETURN_NULL();
@@ -1238,7 +1238,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
12381238
{
12391239
MYSQL_RES *result;
12401240
zval *mysql_result;
1241-
long fetchtype;
1241+
php_int_t fetchtype;
12421242
zval *ctor_params = NULL;
12431243
zend_class_entry *ce = NULL;
12441244

@@ -1266,7 +1266,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
12661266
fetchtype = override_flags;
12671267
} else {
12681268
fetchtype = MYSQLI_BOTH;
1269-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &fetchtype) == FAILURE) {
1269+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", &mysql_result, mysqli_result_class_entry, &fetchtype) == FAILURE) {
12701270
return;
12711271
}
12721272
}

‎ext/mysqli/mysqli_api.c

+50-50
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned in
213213
break;
214214

215215
case 'i': /* Integer */
216-
#if SIZEOF_LONG==8
216+
#if SIZEOF_ZEND_INT==8
217217
bind[ofs].buffer_type = MYSQL_TYPE_LONGLONG;
218-
#elif SIZEOF_LONG==4
218+
#elif SIZEOF_ZEND_INT==4
219219
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
220220
#endif
221221
bind[ofs].buffer = &Z_IVAL_P(param);
@@ -284,9 +284,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned in
284284
type = MYSQL_TYPE_DOUBLE;
285285
break;
286286
case 'i': /* Integer */
287-
#if SIZEOF_LONG==8
287+
#if SIZEOF_ZEND_INT==8
288288
type = MYSQL_TYPE_LONGLONG;
289-
#elif SIZEOF_LONG==4
289+
#elif SIZEOF_ZEND_INT==4
290290
type = MYSQL_TYPE_LONG;
291291
#endif
292292
break;
@@ -326,7 +326,7 @@ PHP_FUNCTION(mysqli_stmt_bind_param)
326326
zval *mysql_stmt;
327327
char *types;
328328
int types_len;
329-
unsigned long rc;
329+
php_uint_t rc;
330330

331331
/* calculate and check number of parameters */
332332
if (argc < 2) {
@@ -392,7 +392,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc, un
392392
int i, ofs;
393393
int var_cnt = argc - start;
394394
long col_type;
395-
ulong rc;
395+
php_uint_t rc;
396396

397397
/* prevent leak if variables are already bound */
398398
if (stmt->result.var_cnt) {
@@ -488,7 +488,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc, un
488488
/* Changed to my_bool in MySQL 5.1. See MySQL Bug #16144 */
489489
my_bool tmp;
490490
#else
491-
ulong tmp = 0;
491+
php_uint_t tmp = 0;
492492
#endif
493493
stmt->result.buf[ofs].type = IS_STRING;
494494
/*
@@ -578,7 +578,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result)
578578
zval *args;
579579
int argc = ZEND_NUM_ARGS();
580580
int start = 1;
581-
ulong rc;
581+
php_uint_t rc;
582582
MY_STMT *stmt;
583583
zval *mysql_stmt;
584584

@@ -624,7 +624,7 @@ PHP_FUNCTION(mysqli_change_user)
624624
zval *mysql_link = NULL;
625625
char *user, *password, *dbname;
626626
int user_len, password_len, dbname_len;
627-
ulong rc;
627+
php_uint_t rc;
628628
#if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET)
629629
const CHARSET_INFO * old_charset;
630630
#endif
@@ -752,11 +752,11 @@ PHP_FUNCTION(mysqli_commit)
752752
{
753753
MY_MYSQL *mysql;
754754
zval *mysql_link;
755-
long flags = TRANS_COR_NO_OPT;
755+
php_int_t flags = TRANS_COR_NO_OPT;
756756
char * name = NULL;
757757
int name_len = 0;
758758

759-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
759+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|is", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
760760
return;
761761
}
762762
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -778,9 +778,9 @@ PHP_FUNCTION(mysqli_data_seek)
778778
{
779779
MYSQL_RES *result;
780780
zval *mysql_result;
781-
long offset;
781+
php_int_t offset;
782782

783-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
783+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
784784
return;
785785
}
786786

@@ -951,7 +951,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
951951
MY_STMT *stmt;
952952
zval *mysql_stmt;
953953
unsigned int i;
954-
ulong ret;
954+
php_uint_t ret;
955955
unsigned int uval;
956956
my_ulonglong llval;
957957

@@ -996,7 +996,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
996996
{
997997
/* unsigned int (11) */
998998
uval= *(unsigned int *) stmt->result.buf[i].val;
999-
#if SIZEOF_LONG==4
999+
#if SIZEOF_ZEND_INT==4
10001000
if (uval > INT_MAX) {
10011001
char *tmp, *p;
10021002
int j = 10;
@@ -1047,9 +1047,9 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
10471047
{
10481048
llval= *(my_ulonglong *) stmt->result.buf[i].val;
10491049
}
1050-
#if SIZEOF_LONG==8
1050+
#if SIZEOF_ZEND_INT==8
10511051
if (uns && llval > 9223372036854775807L) {
1052-
#elif SIZEOF_LONG==4
1052+
#elif SIZEOF_ZEND_INT==4
10531053
if ((uns && llval > L64(2147483647)) ||
10541054
(!uns && (( L64(2147483647) < (my_longlong) llval) ||
10551055
(L64(-2147483648) > (my_longlong) llval))))
@@ -1234,15 +1234,15 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
12341234
MYSQL_RES *result;
12351235
zval *mysql_result;
12361236
const MYSQL_FIELD *field;
1237-
long offset;
1237+
php_int_t offset;
12381238

1239-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
1239+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
12401240
return;
12411241
}
12421242

12431243
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
12441244

1245-
if (offset < 0 || offset >= (long) mysql_num_fields(result)) {
1245+
if (offset < 0 || offset >= (php_int_t) mysql_num_fields(result)) {
12461246
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field offset is invalid for resultset");
12471247
RETURN_FALSE;
12481248
}
@@ -1263,7 +1263,7 @@ PHP_FUNCTION(mysqli_fetch_lengths)
12631263
MYSQL_RES *result;
12641264
zval *mysql_result;
12651265
unsigned int i;
1266-
unsigned long *ret;
1266+
php_uint_t *ret;
12671267

12681268
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
12691269
return;
@@ -1315,9 +1315,9 @@ PHP_FUNCTION(mysqli_field_seek)
13151315
{
13161316
MYSQL_RES *result;
13171317
zval *mysql_result;
1318-
long fieldnr;
1318+
php_int_t fieldnr;
13191319

1320-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) {
1320+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) {
13211321
return;
13221322
}
13231323
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
@@ -1380,7 +1380,7 @@ PHP_FUNCTION(mysqli_get_client_info)
13801380
Get MySQL client info */
13811381
PHP_FUNCTION(mysqli_get_client_version)
13821382
{
1383-
RETURN_INT((long)mysql_get_client_version());
1383+
RETURN_INT((php_int_t)mysql_get_client_version());
13841384
}
13851385
/* }}} */
13861386

@@ -1550,9 +1550,9 @@ PHP_FUNCTION(mysqli_kill)
15501550
{
15511551
MY_MYSQL *mysql;
15521552
zval *mysql_link;
1553-
long processid;
1553+
php_int_t processid;
15541554

1555-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_link, mysqli_link_class_entry, &processid) == FAILURE) {
1555+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_link, mysqli_link_class_entry, &processid) == FAILURE) {
15561556
return;
15571557
}
15581558
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -1761,12 +1761,12 @@ PHP_FUNCTION(mysqli_options)
17611761
MY_MYSQL *mysql;
17621762
zval *mysql_link = NULL;
17631763
zval *mysql_value;
1764-
long mysql_option;
1764+
php_int_t mysql_option;
17651765
unsigned int l_value;
1766-
long ret;
1766+
php_int_t ret;
17671767
int expected_type;
17681768

1769-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) {
1769+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oiz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) {
17701770
return;
17711771
}
17721772
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
@@ -1816,7 +1816,7 @@ PHP_FUNCTION(mysqli_ping)
18161816
{
18171817
MY_MYSQL *mysql;
18181818
zval *mysql_link;
1819-
long rc;
1819+
php_int_t rc;
18201820

18211821
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
18221822
return;
@@ -1976,11 +1976,11 @@ PHP_FUNCTION(mysqli_rollback)
19761976
{
19771977
MY_MYSQL *mysql;
19781978
zval *mysql_link;
1979-
long flags = TRANS_COR_NO_OPT;
1979+
php_int_t flags = TRANS_COR_NO_OPT;
19801980
char * name = NULL;
19811981
int name_len = 0;
19821982

1983-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
1983+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|is", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
19841984
return;
19851985
}
19861986
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -2003,10 +2003,10 @@ PHP_FUNCTION(mysqli_stmt_send_long_data)
20032003
MY_STMT *stmt;
20042004
zval *mysql_stmt;
20052005
char *data;
2006-
long param_nr;
2006+
php_int_t param_nr;
20072007
int data_len;
20082008

2009-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &mysql_stmt, mysqli_stmt_class_entry, &param_nr, &data, &data_len) == FAILURE) {
2009+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ois", &mysql_stmt, mysqli_stmt_class_entry, &param_nr, &data, &data_len) == FAILURE) {
20102010
return;
20112011
}
20122012
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2069,9 +2069,9 @@ PHP_FUNCTION(mysqli_stmt_data_seek)
20692069
{
20702070
MY_STMT *stmt;
20712071
zval *mysql_stmt;
2072-
long offset;
2072+
php_int_t offset;
20732073

2074-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_stmt, mysqli_stmt_class_entry, &offset) == FAILURE) {
2074+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_stmt, mysqli_stmt_class_entry, &offset) == FAILURE) {
20752075
return;
20762076
}
20772077
if (offset < 0) {
@@ -2296,9 +2296,9 @@ PHP_FUNCTION(mysqli_refresh)
22962296
{
22972297
MY_MYSQL *mysql;
22982298
zval *mysql_link = NULL;
2299-
long options;
2299+
php_int_t options;
23002300

2301-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_link, mysqli_link_class_entry, &options) == FAILURE) {
2301+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_link, mysqli_link_class_entry, &options) == FAILURE) {
23022302
return;
23032303
}
23042304
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
@@ -2316,21 +2316,21 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
23162316
{
23172317
MY_STMT *stmt;
23182318
zval *mysql_stmt;
2319-
long mode_in;
2319+
php_int_t mode_in;
23202320
#if MYSQL_VERSION_ID >= 50107
23212321
my_bool mode_b;
23222322
#endif
2323-
ulong mode;
2324-
ulong attr;
2323+
php_uint_t mode;
2324+
php_int_t attr;
23252325
void *mode_p;
23262326

2327-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) {
2327+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oii", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) {
23282328
return;
23292329
}
23302330
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
23312331

23322332
if (mode_in < 0) {
2333-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "mode should be non-negative, %ld passed", mode_in);
2333+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "mode should be non-negative, %pd passed", mode_in);
23342334
RETURN_FALSE;
23352335
}
23362336

@@ -2363,11 +2363,11 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
23632363
{
23642364
MY_STMT *stmt;
23652365
zval *mysql_stmt;
2366-
ulong value = 0;
2367-
ulong attr;
2366+
php_uint_t value = 0;
2367+
php_int_t attr;
23682368
int rc;
23692369

2370-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) {
2370+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) {
23712371
return;
23722372
}
23732373
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2380,7 +2380,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
23802380
if (attr == STMT_ATTR_UPDATE_MAX_LENGTH)
23812381
value = *((my_bool *)&value);
23822382
#endif
2383-
RETURN_INT((long)value);
2383+
RETURN_INT((php_uint_t)value);
23842384
}
23852385
/* }}} */
23862386

@@ -2580,10 +2580,10 @@ PHP_FUNCTION(mysqli_store_result)
25802580
MYSQL_RES *result;
25812581
zval *mysql_link;
25822582
MYSQLI_RESOURCE *mysqli_resource;
2583-
long flags = 0;
2583+
php_int_t flags = 0;
25842584

25852585

2586-
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &mysql_link, mysqli_link_class_entry, &flags) == FAILURE) {
2586+
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", &mysql_link, mysqli_link_class_entry, &flags) == FAILURE) {
25872587
return;
25882588
}
25892589
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -2619,7 +2619,7 @@ PHP_FUNCTION(mysqli_thread_id)
26192619
}
26202620
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
26212621

2622-
RETURN_INT((long) mysql_thread_id(mysql->mysql));
2622+
RETURN_INT((php_int_t) mysql_thread_id(mysql->mysql));
26232623
}
26242624
/* }}} */
26252625

0 commit comments

Comments
 (0)