com php-src: revamp mysqlnd, mysqli, mysql and pdo_mysql: ext/mysql/php_mysql.c ext/mysqli/mysqli_api.c ex t/mysqli/mysqli_exception.c
ext/mysqli/mysqli_nonapi. c ext/mysqli/mysqli_priv.h ext/mysqli/mysqli_prop.c ext/mysqli/mysqli_report.c ext/mysqlnd/mysqlnd.c e xt/mysqlnd/mysqlnd.h
ext/mysqlnd/mysqlnd_alloc.c ext/ mysqlnd/mysqlnd_alloc.h ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_block_alloc.c ext/mysqlnd/mysqlnd _bt.c
ext/mysqlnd/mysqlnd_debug.
| From: | Anatol Belski | Date: | Thu, 09 Jan 2014 03:18:37 +0000 |
| Subject: | com php-src: revamp mysqlnd, mysqli, mysql and pdo_mysql: ext/mysql/php_mysql.c ext/mysqli/mysqli_api.c ex t/mysqli/mysqli_exception.c ext/mysqli/mysqli_nonapi. c ext/mysqli/mysqli_priv.h ext/mysqli/mysqli_prop.c ext/mysqli/mysqli_report.c ext/mysqlnd/mysqlnd.c e xt/mysqlnd/mysqlnd.h ext/mysqlnd/mysqlnd_alloc.c ext/ mysqlnd/mysqlnd_alloc.h ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_block_alloc.c ext/mysqlnd/mysqlnd _bt.c ext/mysqlnd/mysqlnd_debug. |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75556@lists.php.net to get a copy of this message | ||
Commit: 2a468115e335679fabd565624e585588c040b5b8
Author: Anatol Belski <ab@php.net> Thu, 9 Jan 2014 04:18:37 +0100
Parents: 8edaa10eab3943b86e28671cd6f3b0d2f2bea6e5
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a468115e335679fabd565624e585588c040b5b8
Log:
revamp mysqlnd, mysqli, mysql and pdo_mysql
Changed paths:
M ext/mysql/php_mysql.c
M ext/mysqli/mysqli_api.c
M ext/mysqli/mysqli_exception.c
M ext/mysqli/mysqli_nonapi.c
M ext/mysqli/mysqli_priv.h
M ext/mysqli/mysqli_prop.c
M ext/mysqli/mysqli_report.c
M ext/mysqlnd/mysqlnd.c
M ext/mysqlnd/mysqlnd.h
M ext/mysqlnd/mysqlnd_alloc.c
M ext/mysqlnd/mysqlnd_alloc.h
M ext/mysqlnd/mysqlnd_auth.c
M ext/mysqlnd/mysqlnd_block_alloc.c
M ext/mysqlnd/mysqlnd_bt.c
M ext/mysqlnd/mysqlnd_debug.c
M ext/mysqlnd/mysqlnd_debug.h
M ext/mysqlnd/mysqlnd_loaddata..c
M ext/mysqlnd/mysqlnd_net.c
M ext/mysqlnd/mysqlnd_plugin.c
M ext/mysqlnd/mysqlnd_priv.h
M ext/mysqlnd/mysqlnd_ps.c
M ext/mysqlnd/mysqlnd_ps_codec.c
M ext/mysqlnd/mysqlnd_result.c
M ext/mysqlnd/mysqlnd_result.h
M ext/mysqlnd/mysqlnd_result_meta.c
M ext/mysqlnd/mysqlnd_result_meta.h
M ext/mysqlnd/mysqlnd_statistics.c
M ext/mysqlnd/mysqlnd_structs.h
M ext/mysqlnd/mysqlnd_wireprotocol.c
M ext/mysqlnd/mysqlnd_wireprotocol.h
M ext/pdo/pdo_stmt.c
M ext/pdo/php_pdo_driver.h
M ext/pdo_mysql/mysql_driver.c
M ext/pdo_mysql/php_pdo_mysql_int.h
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index ad209dd..2b9e5c3 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1297,7 +1297,7 @@ PHP_FUNCTION(mysql_stat) php_mysql_conn *mysql; char *stat; #ifdef MYSQL_USE_MYSQLND - uint stat_len; + php_size_t stat_len; #endif if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1444,7 +1444,7 @@ PHP_FUNCTION(mysql_drop_db) /* {{{ php_mysql_do_query_general */ -static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_link, int link_id, char *db, int use_store, zval *return_value TSRMLS_DC) +static void php_mysql_do_query_general(char *query, php_size_t query_len, zval *mysql_link, php_int_t link_id, char *db, int use_store, zval *return_value TSRMLS_DC) { php_mysql_conn *mysql; MYSQL_RES *mysql_result; @@ -2299,8 +2299,7 @@ PHP_FUNCTION(mysql_fetch_lengths) zval *result; MYSQL_RES *mysql_result; mysql_row_length_type *lengths; - int num_fields; - int i; + php_int_t num_fields, i; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) { return; diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index eb747b9..115660f 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -679,9 +679,9 @@ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, co { char * commented_name = NULL; - unsigned int commented_name_len = name? spprintf(&commented_name, 0, " /*%s*/", name):0; + php_size_t commented_name_len = name? spprintf(&commented_name, 0, " /*%s*/", name):0; char * query; - unsigned int query_len = spprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), + php_size_t query_len = spprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); smart_str_free(&tmp_str); @@ -1656,7 +1656,7 @@ PHP_FUNCTION(mysqli_num_rows) /* }}} */ /* {{{ mysqli_options_get_option_zval_type */ -static int mysqli_options_get_option_zval_type(int option) +static int mysqli_options_get_option_zval_type(php_int_t option) { switch (option) { #ifdef MYSQLI_USE_MYSQLND @@ -1734,7 +1734,7 @@ PHP_FUNCTION(mysqli_options) zval *mysql_link = NULL; zval **mysql_value; php_int_t mysql_option; - unsigned int l_value; + php_int_t l_value; php_int_t ret; int expected_type; @@ -2239,7 +2239,7 @@ PHP_FUNCTION(mysqli_stat) zval *mysql_link; char *stat; #if defined(MYSQLI_USE_MYSQLND) - uint stat_len; + php_size_t stat_len; #endif if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c index a577161..a7300d2 100644 --- a/ext/mysqli/mysqli_exception.c +++ b/ext/mysqli/mysqli_exception.c @@ -36,7 +36,7 @@ const zend_function_entry mysqli_exception_methods[] = { }; /* }}} */ -void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...) +void php_mysqli_throw_sql_exception(char *sqlstate, php_int_t errorno TSRMLS_DC, char *format, ...) { zval *sql_ex; va_list arg; diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 666650a..2eb04e3 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -784,6 +784,10 @@ PHP_FUNCTION(mysqli_poll) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Negative values passed for sec and/or usec"); RETURN_FALSE; } + if (sec > LONG_MAX || usec > LONG_MAX) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Values passed for sec and/or usec are too long"); + RETURN_FALSE; + } if (!r_array && !e_array) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "No stream arrays were passed"); @@ -995,7 +999,7 @@ PHP_FUNCTION(mysqli_get_charset) MY_MYSQL *mysql; zval *mysql_link; const char *name = NULL, *collation = NULL, *dir = NULL, *comment = NULL; - uint minlength, maxlength, number, state; + php_uint_t minlength, maxlength, number, state; #if !defined(MYSQLI_USE_MYSQLND) MY_CHARSET_INFO cs; #else diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h index 2300516..257679c 100644 --- a/ext/mysqli/mysqli_priv.h +++ b/ext/mysqli/mysqli_priv.h @@ -74,9 +74,9 @@ extern MYSQLI_WARNING *php_get_warnings(MYSQL * mysql TSRMLS_DC); extern void php_clear_warnings(MYSQLI_WARNING *w); extern void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type); -extern void php_mysqli_report_error(const char *sqlstate, int errorno, const char *error TSRMLS_DC); -extern void php_mysqli_report_index(const char *query, unsigned int status TSRMLS_DC); -extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...); +extern void php_mysqli_report_error(const char *sqlstate, php_int_t errorno, const char *error TSRMLS_DC); +extern void php_mysqli_report_index(const char *query, php_uint_t status TSRMLS_DC); +extern void php_mysqli_throw_sql_exception(char *sqlstate, php_int_t errorno TSRMLS_DC, char *format, ...); #ifdef HAVE_SPL extern PHPAPI zend_class_entry *spl_ce_RuntimeException; @@ -105,7 +105,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML } else { \ char *ret; \ /* always used with my_ulonglong -> %llu */ \ - int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (__val)); \ + php_size_t l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (__val)); \ RETURN_STRINGL(ret, l, 0); \ } \ } diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 65384b0..fcddf4e 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -88,7 +88,7 @@ static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \ ZVAL_INT(*retval, (php_int_t) l);\ } else { \ char *ret; \ - int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \ + php_size_t ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \ ZVAL_STRINGL(*retval, ret, ret_len, 0); \ } \ }\ @@ -182,7 +182,7 @@ static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) ZVAL_INT(*retval, (php_int_t) rc); } else { char *ret; - int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); + php_size_t l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); ZVAL_STRINGL(*retval, ret, l, 0); } } @@ -271,7 +271,7 @@ static int link_stat_read(mysqli_object *obj, zval **retval TSRMLS_DC) if (mysql) { char * stat_msg; #if defined(MYSQLI_USE_MYSQLND) - uint stat_msg_len; + php_size_t stat_msg_len; if (mysqlnd_stat(mysql->mysql, &stat_msg, &stat_msg_len) == PASS) { ZVAL_STRINGL(*retval, stat_msg, stat_msg_len, 0); } @@ -382,7 +382,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) ZVAL_INT(*retval, (php_int_t) rc); } else { char *ret; - int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); + php_size_t l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); ZVAL_STRINGL(*retval, ret, l, 0); } } diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index c4ffd1c..e85b52f 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -27,7 +27,7 @@ #include "ext/standard/info.h" #include "php_mysqli_structs.h" -extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...); +extern void php_mysqli_throw_sql_exception(char *sqlstate, php_int_t errorno TSRMLS_DC, char *format, ...); /* {{{ proto bool mysqli_report(int flags) sets report level */ @@ -47,14 +47,14 @@ PHP_FUNCTION(mysqli_report) /* }}} */ /* {{{ void php_mysqli_report_error(char *sqlstate, int errorno, char *error) */ -void php_mysqli_report_error(const char *sqlstate, int errorno, const char *error TSRMLS_DC) +void php_mysqli_report_error(const char *sqlstate, php_int_t errorno, const char *error TSRMLS_DC) { php_mysqli_throw_sql_exception((char *)sqlstate, errorno TSRMLS_CC, "%s", error); } /* }}} */ /* {{{ void php_mysqli_report_index() */ -void php_mysqli_report_index(const char *query, unsigned int status TSRMLS_DC) { +void php_mysqli_report_index(const char *query, php_uint_t status TSRMLS_DC) { char index[15]; if (status & SERVER_QUERY_NO_GOOD_INDEX_USED) { diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index bfb6f36..d1f057e 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -80,7 +80,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, free_options)(MYSQLND_CONN_DATA * conn TSRMLS_ conn->options->auth_protocol = NULL; } if (conn->options->num_commands) { - unsigned int i; + php_uint_t i; for (i = 0; i < conn->options->num_commands; i++) { /* allocated with pestrdup */ mnd_pefree(conn->options->init_commands[i], pers); @@ -519,7 +519,7 @@ mysqlnd_run_authentication( const zend_uchar * const auth_plugin_data, const size_t auth_plugin_data_len, const char * const auth_protocol, - unsigned int charset_no, + php_uint_t charset_no, const MYSQLND_OPTIONS * const options, php_uint_t mysql_flags, zend_bool silent, @@ -678,7 +678,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, execute_init_commands)(MYSQLND_CONN_DATA * con DBG_ENTER("mysqlnd_conn_data::execute_init_commands"); if (conn->options->init_commands) { - unsigned int current_command = 0; + php_uint_t current_command = 0; for (; current_command < conn->options->num_commands; ++current_command) { const char * const command = conn->options->init_commands[current_command]; if (command) { @@ -703,8 +703,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, execute_init_commands)(MYSQLND_CONN_DATA * con /* {{{ mysqlnd_conn_data::get_updated_connect_flags */ -static unsigned int -MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, unsigned int mysql_flags TSRMLS_DC) +static php_int_t +MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, php_int_t mysql_flags TSRMLS_DC) { MYSQLND_NET * net = conn->net; @@ -748,9 +748,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * static enum_func_status MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn, const char * const host, const char * const user, - const char * const passwd, const unsigned int passwd_len, - const char * const db, const unsigned int db_len, - const unsigned int mysql_flags TSRMLS_DC) + const char * const passwd, const php_size_t passwd_len, + const char * const db, const php_size_t db_len, + const php_int_t mysql_flags TSRMLS_DC) { MYSQLND_PACKET_GREET * greet_packet; MYSQLND_NET * net = conn->net; @@ -829,11 +829,11 @@ err: static enum_func_status MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, const char *host, const char *user, - const char *passwd, unsigned int passwd_len, - const char *db, unsigned int db_len, - unsigned int port, + const char *passwd, php_size_t passwd_len, + const char *db, php_size_t db_len, + php_uint_t port, const char *socket_or_pipe, - unsigned int mysql_flags + php_int_t mysql_flags TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, connect); @@ -888,7 +888,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, net->data->ssl = FALSE; } } else { - unsigned int max_allowed_size = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE; + php_uint_t max_allowed_size = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE; conn->m->set_client_option(conn, MYSQLND_OPT_MAX_ALLOWED_PACKET, (char *)&max_allowed_size TSRMLS_CC); } @@ -1080,11 +1080,11 @@ err: static enum_func_status MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn_handle, const char * host, const char * user, - const char * passwd, unsigned int passwd_len, - const char * db, unsigned int db_len, - unsigned int port, + const char * passwd, php_size_t passwd_len, + const char * db, php_size_t db_len, + php_uint_t port, const char * socket_or_pipe, - unsigned int mysql_flags + php_uint_t mysql_flags TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, connect); @@ -1107,11 +1107,11 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn_handle, /* {{{ mysqlnd_connect */ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn_handle, const char * host, const char * user, - const char * passwd, unsigned int passwd_len, - const char * db, unsigned int db_len, - unsigned int port, + const char * passwd, php_size_t passwd_len, + const char * db, php_size_t db_len, + php_uint_t port, const char * socket_or_pipe, - unsigned int mysql_flags + php_uint_t mysql_flags TSRMLS_DC) { enum_func_status ret = FAIL; @@ -1151,7 +1151,7 @@ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn_handle, Still the result from the query is PASS */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, query)(MYSQLND_CONN_DATA * conn, const char * query, php_size_t query_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, query); enum_func_status ret = FAIL; @@ -1176,7 +1176,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, query)(MYSQLND_CONN_DATA * conn, const char * /* {{{ mysqlnd_conn_data::send_query */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, php_size_t query_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, send_query); enum_func_status ret = FAIL; @@ -1267,7 +1267,7 @@ static int mysqlnd_stream_array_to_fd_set(MYSQLND ** conn_array, fd_set * fds, p { php_socket_t this_fd; php_stream *stream = NULL; - unsigned int cnt = 0; + php_uint_t cnt = 0; MYSQLND **p = conn_array; DBG_ENTER("mysqlnd_stream_array_to_fd_set"); @@ -1536,7 +1536,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, list_method)(MYSQLND_CONN_DATA * conn, const c /* {{{ mysqlnd_conn_data::errno */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, errno)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->error_info->error_no; @@ -1640,7 +1640,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, dump_debug_info)(MYSQLND_CONN_DATA * const con /* {{{ mysqlnd_conn_data::select_db */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, unsigned int db_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, php_size_t db_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, select_db); enum_func_status ret = FAIL; @@ -1702,7 +1702,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, ping)(MYSQLND_CONN_DATA * const conn TSRMLS_DC /* {{{ mysqlnd_conn_data::statistic */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **message, unsigned int * message_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **message, php_size_t * message_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, get_server_statistics); enum_func_status ret = FAIL; @@ -1741,7 +1741,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **me /* {{{ mysqlnd_conn_data::kill */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, kill)(MYSQLND_CONN_DATA * conn, unsigned int pid TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, kill)(MYSQLND_CONN_DATA * conn, php_uint_t pid TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, kill_connection); enum_func_status ret = FAIL; @@ -1973,7 +1973,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, set_state)(MYSQLND_CONN_DATA * const c /* {{{ mysqlnd_conn_data::field_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, field_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->field_count; @@ -1982,7 +1982,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, field_count)(const MYSQLND_CONN_DATA * const c /* {{{ mysqlnd_conn_data::server_status */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, server_status)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->upsert_status->server_status; @@ -2009,7 +2009,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, affected_rows)(const MYSQLND_CONN_DATA * const /* {{{ mysqlnd_conn_data::warning_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, warning_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->upsert_status->warning_count; @@ -2034,7 +2034,7 @@ PHPAPI const char * mysqlnd_get_client_info() /* {{{ mysqlnd_get_client_version */ -PHPAPI unsigned int mysqlnd_get_client_version() +PHPAPI php_uint_t mysqlnd_get_client_version() { return MYSQLND_VERSION_ID; } @@ -2060,7 +2060,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_host_info)(const MYSQLND_CONN_DATA * const /* {{{ mysqlnd_conn_data::get_proto_info */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, get_proto_info)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->protocol_version; @@ -2612,7 +2612,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_connection_stats)(const MYSQLND_CONN_DATA /* {{{ mysqlnd_conn_data::set_autocommit */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, set_autocommit)(MYSQLND_CONN_DATA * conn, unsigned int mode TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, set_autocommit)(MYSQLND_CONN_DATA * conn, php_uint_t mode TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_autocommit); enum_func_status ret = FAIL; @@ -2648,7 +2648,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_rollback)(MYSQLND_CONN_DATA * conn TSRMLS_D /* {{{ mysqlnd_tx_cor_options_to_string */ static void -MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * str, const unsigned int mode TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * str, const php_int_t mode TSRMLS_DC) { if (mode & TRANS_COR_AND_CHAIN && !(mode & TRANS_COR_AND_NO_CHAIN)) { if (str->len) { @@ -2680,7 +2680,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const MYSQLND_CONN_D /* {{{ mysqlnd_conn_data::tx_commit_ex */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const unsigned int flags, const char * const name TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const php_int_t flags, const char * const name TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_commit_or_rollback); enum_func_status ret = FAIL; @@ -2694,9 +2694,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con { char * commented_name = NULL; - unsigned int commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; + php_size_t commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; char * query; - unsigned int query_len = mnd_sprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), + php_int_t query_len = mnd_sprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); smart_str_free(&tmp_str); @@ -2721,7 +2721,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con /* {{{ mysqlnd_conn_data::tx_begin */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsigned int mode, const char * const name TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const php_uint_t mode, const char * const name TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_begin); enum_func_status ret = FAIL; @@ -2752,9 +2752,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsi { char * commented_name = NULL; - unsigned int commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; + php_size_t commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; char * query; - unsigned int query_len = mnd_sprintf(&query, 0, "START TRANSACTION%s %s", commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); + php_size_t query_len = mnd_sprintf(&query, 0, "START TRANSACTION%s %s", commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); smart_str_free(&tmp_str); if (!query) { @@ -2787,7 +2787,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_savepoint)(MYSQLND_CONN_DATA * conn, const if (PASS == conn->m->local_tx_start(conn, this_func TSRMLS_CC)) { do { char * query; - unsigned int query_len; + php_size_t query_len; if (!name) { SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "Savepoint name not provided"); break; @@ -2819,7 +2819,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_savepoint_release)(MYSQLND_CONN_DATA * conn if (PASS == conn->m->local_tx_start(conn, this_func TSRMLS_CC)) { do { char * query; - unsigned int query_len; + php_size_t query_len; if (!name) { SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "Savepoint name not provided"); break; diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index c138cf1..f8c5961 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -66,9 +66,9 @@ PHPAPI void mysqlnd_library_init(TSRMLS_D); PHPAPI void mysqlnd_library_end(TSRMLS_D); -PHPAPI unsigned int mysqlnd_plugin_register(); -PHPAPI unsigned int mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC); -PHPAPI unsigned int mysqlnd_plugin_count(); +PHPAPI php_uint_t mysqlnd_plugin_register(); +PHPAPI php_uint_t mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC); +PHPAPI php_uint_t mysqlnd_plugin_count(); PHPAPI void * _mysqlnd_plugin_find(const char * const name TSRMLS_DC); #define mysqlnd_plugin_find(name) _mysqlnd_plugin_find((name) TSRMLS_CC); @@ -89,11 +89,11 @@ PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_name(const char * const char PHPAPI MYSQLND * _mysqlnd_init(zend_bool persistent TSRMLS_DC); PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn, const char * host, const char * user, - const char * passwd, unsigned int passwd_len, - const char * db, unsigned int db_len, - unsigned int port, + const char * passwd, php_size_t passwd_len, + const char * db, php_size_t db_len, + php_uint_t port, const char * socket_or_pipe, - unsigned int mysql_flags + php_uint_t mysql_flags TSRMLS_DC); #define mysqlnd_change_user(conn, user, passwd, db, silent) ((conn)->data)->m->change_user((conn)->data, (user), (passwd), (db), (silent), strlen((passwd)) TSRMLS_CC) @@ -161,7 +161,7 @@ PHPAPI php_uint_t * _mysqlnd_fetch_lengths(MYSQLND_RES * const result TSRMLS_DC /* mysqlnd metadata */ PHPAPI const char * mysqlnd_get_client_info(); -PHPAPI unsigned int mysqlnd_get_client_version(); +PHPAPI php_uint_t mysqlnd_get_client_version(); #define mysqlnd_ssl_set(conn, key, cert, ca, capath, cipher) ((conn)->data)->m->ssl_set((conn)->data, (key), (cert), (ca), (capath), (cipher) TSRMLS_CC) diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c index 7f9ba76..b1fcdd4 100644 --- a/ext/mysqlnd/mysqlnd_alloc.c +++ b/ext/mysqlnd/mysqlnd_alloc.c @@ -157,7 +157,7 @@ void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D) /* {{{ _mysqlnd_ecalloc */ -void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +void * _mysqlnd_ecalloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { void *ret; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); @@ -198,7 +198,7 @@ void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) /* {{{ _mysqlnd_pecalloc */ -void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) +void * _mysqlnd_pecalloc(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) { void *ret; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); @@ -427,7 +427,7 @@ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D) /* {{{ _mysqlnd_calloc */ -void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +void * _mysqlnd_calloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { void *ret; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); @@ -660,7 +660,7 @@ static void * mysqlnd_zend_mm_pemalloc(size_t size, zend_bool persistent MYSQLND /* {{{ mysqlnd_zend_mm_ecalloc */ -static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +static void * mysqlnd_zend_mm_ecalloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { return ecalloc(nmemb, size); } @@ -668,7 +668,7 @@ static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size MYSQLND_ME /* {{{ mysqlnd_zend_mm_pecalloc */ -static void * mysqlnd_zend_mm_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) +static void * mysqlnd_zend_mm_pecalloc(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) { return pecalloc(nmemb, size, persistent); } @@ -716,7 +716,7 @@ static void * mysqlnd_zend_mm_malloc(size_t size MYSQLND_MEM_D) /* {{{ mysqlnd_zend_mm_calloc */ -static void * mysqlnd_zend_mm_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +static void * mysqlnd_zend_mm_calloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { return calloc(nmemb, size); } diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index eef5988..32a344c 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -33,14 +33,14 @@ struct st_mysqlnd_allocator_methods { void * (*m_emalloc)(size_t size MYSQLND_MEM_D); void * (*m_pemalloc)(size_t size, zend_bool persistent MYSQLND_MEM_D); - void * (*m_ecalloc)(unsigned int nmemb, size_t size MYSQLND_MEM_D); - void * (*m_pecalloc)(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); + void * (*m_ecalloc)(php_uint_t nmemb, size_t size MYSQLND_MEM_D); + void * (*m_pecalloc)(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); void * (*m_erealloc)(void *ptr, size_t new_size MYSQLND_MEM_D); void * (*m_perealloc)(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); void (*m_efree)(void *ptr MYSQLND_MEM_D); void (*m_pefree)(void *ptr, zend_bool persistent MYSQLND_MEM_D); void * (*m_malloc)(size_t size MYSQLND_MEM_D); - void * (*m_calloc)(unsigned int nmemb, size_t size MYSQLND_MEM_D); + void * (*m_calloc)(php_uint_t nmemb, size_t size MYSQLND_MEM_D); void * (*m_realloc)(void *ptr, size_t new_size MYSQLND_MEM_D); void (*m_free)(void *ptr MYSQLND_MEM_D); char * (*m_pestrndup)(const char * const ptr, size_t size, zend_bool persistent MYSQLND_MEM_D); @@ -54,14 +54,14 @@ PHPAPI extern struct st_mysqlnd_allocator_methods mysqlnd_allocator; PHPAPI void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_ecalloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_pecalloc(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); PHPAPI void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); PHPAPI void _mysqlnd_efree(void *ptr MYSQLND_MEM_D); PHPAPI void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D); PHPAPI void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_calloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D); PHPAPI void _mysqlnd_free(void *ptr MYSQLND_MEM_D); PHPAPI char * _mysqlnd_pestrndup(const char * const ptr, size_t size, zend_bool persistent MYSQLND_MEM_D); diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 5c8fcb3..888c71e 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -38,7 +38,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const size_t db_len, const MYSQLND_OPTIONS * const options, php_uint_t mysql_flags, - unsigned int server_charset_no, + php_uint_t server_charset_no, zend_bool use_full_blown_auth_packet, const char * const auth_protocol, const zend_uchar * const auth_plugin_data, @@ -465,7 +465,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_pam_authentication_plugin static void mysqlnd_xor_string(char * dst, const size_t dst_len, const char * xor_str, const size_t xor_str_len) { - unsigned int i; + php_size_t i; for (i = 0; i <= dst_len; ++i) { dst[i] ^= xor_str[i % xor_str_len]; } diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c index 100e807..246aaf0 100644 --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@ -54,7 +54,7 @@ mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC) /* {{{ mysqlnd_mempool_resize_chunk */ static enum_func_status -mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size TSRMLS_DC) +mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, php_size_t size TSRMLS_DC) { DBG_ENTER("mysqlnd_mempool_resize_chunk"); if (chunk->from_pool) { @@ -112,7 +112,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz /* {{{ mysqlnd_mempool_get_chunk */ static -MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool, unsigned int size TSRMLS_DC) +MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool, php_size_t size TSRMLS_DC) { MYSQLND_MEMORY_POOL_CHUNK *chunk = NULL; DBG_ENTER("mysqlnd_mempool_get_chunk"); diff --git a/ext/mysqlnd/mysqlnd_bt.c b/ext/mysqlnd/mysqlnd_bt.c index bfe40c7..6a18757 100644 --- a/ext/mysqlnd/mysqlnd_bt.c +++ b/ext/mysqlnd/mysqlnd_bt.c @@ -32,7 +32,7 @@ #define TRACE_APPEND_STRL(val, vallen) \ { \ - int l = vallen; \ + php_size_t l = vallen; \ *str = (char*)erealloc(*str, *len + l + 1); \ memcpy((*str) + *len, val, l); \ *len += l; \ @@ -53,10 +53,10 @@ static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { char **str; - int *len; + php_size_t *len; str = va_arg(args, char**); - len = va_arg(args, int*); + len = va_arg(args, php_size_t*); /* the trivial way would be to do: * conver_to_string_ex(arg); @@ -69,7 +69,7 @@ mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, zend_ TRACE_APPEND_STR("NULL, "); break; case IS_STRING: { - int l_added; + php_size_t l_added; TRACE_APPEND_CHR('\''); if (Z_STRSIZE_PP(arg) > 15) { TRACE_APPEND_STRL(Z_STRVAL_PP(arg), 15); @@ -150,7 +150,8 @@ static int mysqlnd_build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { char *s_tmp, **str; - int *len, *num; + php_size_t *len; + int *num; php_int_t line; HashTable *ht = Z_ARRVAL_PP(frame); zval **file, **tmp; @@ -158,7 +159,7 @@ mysqlnd_build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, z level = va_arg(args, uint *); str = va_arg(args, char**); - len = va_arg(args, int*); + len = va_arg(args, php_size_t*); num = va_arg(args, int*); if (!*level) { @@ -188,7 +189,7 @@ mysqlnd_build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, z TRACE_APPEND_KEY("function"); TRACE_APPEND_CHR('('); if (zend_hash_find(ht, "args", sizeof("args"), (void**)&tmp) == SUCCESS) { - int last_len = *len; + php_size_t last_len = *len; zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp) TSRMLS_CC, (apply_func_args_t)mysqlnd_build_trace_args, 2, str, len); if (last_len != *len) { *len -= 2; /* remove last ', ' */ diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index 0382410..9ad36f6 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -62,8 +62,8 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self, enum_func_status ret; int i; char * message_line; - unsigned int message_line_len; - unsigned int flags = self->flags; + php_size_t message_line_len; + php_uint_t flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], line_buffer[6], level_buffer[7]; MYSQLND_ZTS(self); @@ -159,9 +159,9 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, int i; enum_func_status ret; char * message_line, *buffer; - unsigned int message_line_len; + php_size_t message_line_len; va_list args; - unsigned int flags = self->flags; + php_uint_t flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], line_buffer[6], level_buffer[7]; MYSQLND_ZTS(self); @@ -256,7 +256,7 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, static zend_bool MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, - const char * const func_name, unsigned int func_name_len) + const char * const func_name, php_size_t func_name_len) { if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) { return FALSE; @@ -322,7 +322,7 @@ struct st_mysqlnd_dbg_function_profile { /* {{{ mysqlnd_debug::func_leave */ static enum_func_status -MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, uint64_t call_time) +MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, php_uint_t line, const char * const file, uint64_t call_time) { char *func_name; uint64_t * parent_non_own_time_ptr = NULL, * mine_non_own_time_ptr = NULL; @@ -361,7 +361,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin struct st_mysqlnd_dbg_function_profile f_profile_stack = {0}; struct st_mysqlnd_dbg_function_profile * f_profile = NULL; uint64_t own_time = call_time - mine_non_own_time; - uint func_name_len = strlen(func_name); + php_size_t func_name_len = strlen(func_name); self->m->log_va(self, line, file, zend_stack_count(&self->call_stack) - 1, NULL, "<%s (total=%u own=%u in_calls=%u)", func_name, (unsigned int) call_time, (unsigned int) own_time, (unsigned int) mine_non_own_time @@ -516,7 +516,7 @@ enum mysqlnd_debug_parser_state static void MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const mode) { - unsigned int mode_len, i; + php_size_t mode_len, i; enum mysqlnd_debug_parser_state state = PARSER_WAIT_MODIFIER; mode_len = mode? strlen(mode) : 0; @@ -543,7 +543,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const self->flags |= MYSQLND_DEBUG_APPEND; } if (i + 1 < mode_len && mode[i+1] == ',') { - unsigned int j = i + 2; + php_size_t j = i + 2; #ifdef PHP_WIN32 if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' || mode[i+5] == '/')) { j = i + 5; @@ -575,7 +575,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const break; case 'f': /* limit output to these functions */ if (i + 1 < mode_len && mode[i+1] == ',') { - unsigned int j = i + 2; + php_size_t j = i + 2; i++; while (j < mode_len) { if (mode[j] == ':') { @@ -588,7 +588,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const if (mode[j] == ',' || mode[j] == ':') { if (j > i + 2) { char func_name[1024]; - unsigned int func_name_len = MIN(sizeof(func_name) - 1, j - i - 1); + php_size_t func_name_len = MIN(sizeof(func_name) - 1, j - i - 1); memcpy(func_name, mode + i + 1, func_name_len); func_name[func_name_len] = '\0'; @@ -645,7 +645,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const break; case 't': if (mode[i+1] == ',') { - unsigned int j = i + 2; + php_size_t j = i + 2; while (j < mode_len) { if (mode[j] == ':') { break; diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index 9fbbdc4..a494efe 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -35,8 +35,8 @@ struct st_mysqlnd_debug_methods enum_func_status (*log_va)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, unsigned int level, const char * type, const char *format, ...); zend_bool (*func_enter)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, - const char * const func_name, unsigned int func_name_len); - enum_func_status (*func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, uint64_t call_time); + const char * const func_name, php_size_t func_name_len); + enum_func_status (*func_leave)(MYSQLND_DEBUG * self, php_uint_t line, const char * const file, uint64_t call_time); enum_func_status (*close)(MYSQLND_DEBUG * self); enum_func_status (*free_handle)(MYSQLND_DEBUG * self); }; diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c index 94d69a4..51f05dd 100644 --- a/ext/mysqlnd/mysqlnd_loaddata.c +++ b/ext/mysqlnd/mysqlnd_loaddata.c @@ -66,7 +66,7 @@ int mysqlnd_local_infile_init(void ** ptr, char * filename, void ** userdata TSR /* {{{ mysqlnd_local_infile_read */ static -int mysqlnd_local_infile_read(void * ptr, zend_uchar * buf, unsigned int buf_len TSRMLS_DC) +int mysqlnd_local_infile_read(void * ptr, zend_uchar * buf, php_size_t buf_len TSRMLS_DC) { MYSQLND_INFILE_INFO *info = (MYSQLND_INFILE_INFO *)ptr; int count; @@ -87,7 +87,7 @@ int mysqlnd_local_infile_read(void * ptr, zend_uchar * buf, unsigned int buf_len /* {{{ mysqlnd_local_infile_error */ static -int mysqlnd_local_infile_error(void * ptr, char *error_buf, unsigned int error_buf_len TSRMLS_DC) +int mysqlnd_local_infile_error(void * ptr, char *error_buf, php_size_t error_buf_len TSRMLS_DC) { MYSQLND_INFILE_INFO *info = (MYSQLND_INFILE_INFO *)ptr; @@ -160,7 +160,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen zend_uchar *buf = NULL; zend_uchar empty_packet[MYSQLND_HEADER_SIZE]; enum_func_status result = FAIL; - unsigned int buflen = 4096; + php_size_t buflen = 4096; void *info = NULL; int bufsize; size_t ret; diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index b1a628a..c3b8f91 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -45,7 +45,7 @@ static int mysqlnd_set_sock_no_delay(php_stream * stream TSRMLS_DC) { - int socketd = ((php_netstream_data_t*)stream->abstract)->socket; + php_socket_t socketd = ((php_netstream_data_t*)stream->abstract)->socket; int ret = SUCCESS; int flag = 1; int result = setsockopt(socketd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int)); @@ -1030,7 +1030,7 @@ MYSQLND_METHOD(mysqlnd_net, close_stream)(MYSQLND_NET * const net, MYSQLND_STATS static enum_func_status MYSQLND_METHOD(mysqlnd_net, init)(MYSQLND_NET * const net, MYSQLND_STATS * const stats, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC) { - unsigned int buf_size; + php_size_t buf_size; DBG_ENTER("mysqlnd_net::init"); buf_size = MYSQLND_G(net_cmd_buffer_size); /* this is long, cast to unsigned int*/ diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c index 86543a0..41e176a 100644 --- a/ext/mysqlnd/mysqlnd_plugin.c +++ b/ext/mysqlnd/mysqlnd_plugin.c @@ -92,7 +92,7 @@ mysqlnd_example_plugin_register(TSRMLS_D) static HashTable mysqlnd_registered_plugins; -static unsigned int mysqlnd_plugins_counter = 0; +static php_uint_t mysqlnd_plugins_counter = 0; /* {{{ mysqlnd_plugin_subsystem_init */ @@ -128,7 +128,7 @@ mysqlnd_plugin_subsystem_end(TSRMLS_D) /* {{{ mysqlnd_plugin_register */ -PHPAPI unsigned int mysqlnd_plugin_register() +PHPAPI php_uint_t mysqlnd_plugin_register() { TSRMLS_FETCH(); return mysqlnd_plugin_register_ex(NULL TSRMLS_CC); @@ -137,7 +137,7 @@ PHPAPI unsigned int mysqlnd_plugin_register() /* {{{ mysqlnd_plugin_register_ex */ -PHPAPI unsigned int mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC) +PHPAPI php_uint_t mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC) { if (plugin) { if (plugin->plugin_api_version == MYSQLND_PLUGIN_API_VERSION) { @@ -192,7 +192,7 @@ PHPAPI void _mysqlnd_plugin_apply_with_argument(apply_func_arg_t apply_func, voi /* {{{ mysqlnd_plugin_count */ -PHPAPI unsigned int mysqlnd_plugin_count() +PHPAPI php_uint_t mysqlnd_plugin_count() { return mysqlnd_plugins_counter; } diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h index a868aa7..19fc644 100644 --- a/ext/mysqlnd/mysqlnd_priv.h +++ b/ext/mysqlnd/mysqlnd_priv.h @@ -159,11 +159,11 @@ #define CONN_SET_STATE(c, s) (c)->m->set_state((c), (s) TSRMLS_CC) /* PS stuff */ -typedef void (*ps_field_fetch_func)(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC); +typedef void (*ps_field_fetch_func)(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC); struct st_mysqlnd_perm_bind { ps_field_fetch_func func; /* should be signed int */ - int pack_len; + php_size_t pack_len; unsigned int php_type; zend_bool is_possibly_blob; zend_bool can_ret_as_str_in_uni; @@ -190,7 +190,7 @@ enum_func_status mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const cha void _mysqlnd_init_ps_subsystem();/* This one is private, mysqlnd_library_init() will call it */ void _mysqlnd_init_ps_fetch_subsystem(); -void ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row, unsigned int byte_count TSRMLS_DC); +void ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row, php_uint_t byte_count TSRMLS_DC); void mysqlnd_plugin_subsystem_init(TSRMLS_D); void mysqlnd_plugin_subsystem_end(TSRMLS_D); @@ -211,7 +211,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const size_t db_len, const MYSQLND_OPTIONS * const options, php_uint_t mysql_flags, - unsigned int server_charset_no, + php_uint_t server_charset_no, zend_bool use_full_blown_auth_packet, const char * const auth_protocol, const zend_uchar * const auth_plugin_data, diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 7944d47..42338f0 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -40,15 +40,15 @@ const char * const mysqlnd_stmt_not_prepared = "Statement not prepared"; enum_func_status mysqlnd_stmt_execute_generate_request(MYSQLND_STMT * const s, zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC); enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, - unsigned int flags, + php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC); enum_func_status mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, - unsigned int flags, + php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC); static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt TSRMLS_DC); -static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC); +static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, php_uint_t param_no TSRMLS_DC); /* {{{ mysqlnd_stmt::store_result */ @@ -241,7 +241,7 @@ mysqlnd_stmt_skip_metadata(MYSQLND_STMT * s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; /* Follows parameter metadata, we have just to skip it, as libmysql does */ - unsigned int i = 0; + php_uint_t i = 0; enum_func_status ret = FAIL; MYSQLND_PACKET_RES_FIELD * field_packet; @@ -357,7 +357,7 @@ mysqlnd_stmt_prepare_read_eof(MYSQLND_STMT * s TSRMLS_DC) /* {{{ mysqlnd_stmt::prepare */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const query, php_size_t query_len TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; MYSQLND_STMT * s_to_prepare = s; @@ -621,7 +621,7 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC) bind_result(); execute(); <-- here we will leak because we separate without need */ - unsigned int i; + php_uint_t i; for (i = 0; i < stmt->field_count; i++) { if (stmt->result_bind[i].bound == TRUE) { zval_copy_ctor(stmt->result_bind[i].zv); @@ -650,7 +650,7 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC) } if (stmt->param_count) { - unsigned int i, not_bound = 0; + php_uint_t i, not_bound = 0; if (!stmt->param_bind) { SET_STMT_ERROR(stmt, CR_PARAMS_NOT_BOUND, UNKNOWN_SQLSTATE, "No data supplied for parameters in prepared statement"); @@ -709,12 +709,12 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt_fetch_row_buffered */ enum_func_status -mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { MYSQLND_STMT * s = (MYSQLND_STMT *) param; MYSQLND_STMT_DATA * stmt = s? s->data:NULL; MYSQLND_RES_BUFFERED *set = result->stored_data; - unsigned int field_count = result->meta->field_count; + php_uint_t field_count = result->meta->field_count; DBG_ENTER("mysqlnd_stmt_fetch_row_buffered"); *fetched_anything = FALSE; @@ -726,7 +726,7 @@ mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int f { /* The user could have skipped binding - don't crash*/ if (stmt->result_bind) { - unsigned int i; + php_uint_t i; MYSQLND_RES_METADATA * meta = result->meta; zval **current_row = set->data_cursor; @@ -806,7 +806,7 @@ mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int f /* {{{ mysqlnd_stmt_fetch_row_unbuffered */ static enum_func_status -mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { enum_func_status ret; MYSQLND_STMT * s = (MYSQLND_STMT *) param; @@ -840,7 +840,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int result->m.unbuffered_free_last_data() before it. The function returns always true. */ if (PASS == (ret = PACKET_READ(row_packet, result->conn)) && !row_packet->eof) { - unsigned int i, field_count = result->field_count; + php_uint_t i, field_count = result->field_count; if (!row_packet->skip_extraction) { result->m.unbuffered_free_last_data(result TSRMLS_CC); @@ -973,7 +973,7 @@ MYSQLND_METHOD(mysqlnd_stmt, use_result)(MYSQLND_STMT * s TSRMLS_DC) /* {{{ mysqlnd_fetch_row_cursor */ enum_func_status -mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { enum_func_status ret; MYSQLND_STMT * s = (MYSQLND_STMT *) param; @@ -1018,7 +1018,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla memset(stmt->upsert_status, 0, sizeof(*stmt->upsert_status)); if (PASS == (ret = PACKET_READ(row_packet, result->conn)) && !row_packet->eof) { - unsigned int i, field_count = result->field_count; + php_uint_t i, field_count = result->field_count; if (!row_packet->skip_extraction) { result->m.unbuffered_free_last_data(result TSRMLS_CC); @@ -1145,7 +1145,7 @@ MYSQLND_METHOD(mysqlnd_stmt, fetch)(MYSQLND_STMT * const s, zend_bool * const fe Do the binding once she does it. */ if (stmt->result_bind && !stmt->result_zvals_separated_once) { - unsigned int i; + php_uint_t i; /* mysqlnd_stmt_store_result() has been called free the bind variables to prevent leaking of their previous content. @@ -1185,7 +1185,7 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s TSRMLS_DC) if (stmt->stmt_id) { MYSQLND_CONN_DATA * conn = stmt->conn; if (stmt->param_bind) { - unsigned int i; + php_uint_t i; DBG_INF("resetting long data"); /* Reset Long Data */ for (i = 0; i < stmt->param_count; i++) { @@ -1258,7 +1258,7 @@ MYSQLND_METHOD(mysqlnd_stmt, flush)(MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt::send_long_data */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned int param_no, +MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, php_uint_t param_no, const char * const data, php_uint_t length TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1392,7 +1392,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_parameters)(MYSQLND_STMT * const s, MYSQLND_PA SET_EMPTY_ERROR(*stmt->conn->error_info); if (stmt->param_count) { - unsigned int i = 0; + php_uint_t i = 0; if (!param_bind) { SET_STMT_ERROR(stmt, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, "Re-binding (still) not supported"); @@ -1440,7 +1440,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_parameters)(MYSQLND_STMT * const s, MYSQLND_PA /* {{{ mysqlnd_stmt::bind_one_parameter */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigned int param_no, +MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, php_uint_t param_no, zval * const zv, zend_uchar type TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1548,7 +1548,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const s, SET_EMPTY_ERROR(*stmt->conn->error_info); if (stmt->field_count) { - unsigned int i = 0; + php_uint_t i = 0; if (!result_bind) { DBG_ERR("no result bind passed"); @@ -1580,7 +1580,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const s, /* {{{ mysqlnd_stmt::bind_result */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const s, unsigned int param_no TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const s, php_uint_t param_no TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; DBG_ENTER("mysqlnd_stmt::bind_result"); @@ -1660,7 +1660,7 @@ MYSQLND_METHOD(mysqlnd_stmt, num_rows)(const MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt::warning_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, warning_count)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1670,7 +1670,7 @@ MYSQLND_METHOD(mysqlnd_stmt, warning_count)(const MYSQLND_STMT * const s TSRMLS_ /* {{{ mysqlnd_stmt::server_status */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, server_status)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1680,7 +1680,7 @@ MYSQLND_METHOD(mysqlnd_stmt, server_status)(const MYSQLND_STMT * const s TSRMLS_ /* {{{ mysqlnd_stmt::field_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, field_count)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1690,7 +1690,7 @@ MYSQLND_METHOD(mysqlnd_stmt, field_count)(const MYSQLND_STMT * const s TSRMLS_DC /* {{{ mysqlnd_stmt::param_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, param_count)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1700,7 +1700,7 @@ MYSQLND_METHOD(mysqlnd_stmt, param_count)(const MYSQLND_STMT * const s TSRMLS_DC /* {{{ mysqlnd_stmt::errno */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, errno)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1837,7 +1837,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s, break; } case STMT_ATTR_CURSOR_TYPE: { - unsigned int ival = *(unsigned int *) value; + php_uint_t ival = *(php_uint_t *) value; if (ival > (php_uint_t) CURSOR_TYPE_READ_ONLY) { SET_STMT_ERROR(stmt, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Not implemented"); DBG_INF("FAIL"); @@ -1847,7 +1847,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s, break; } case STMT_ATTR_PREFETCH_ROWS: { - unsigned int ival = *(unsigned int *) value; + php_uint_t ival = *(php_uint_t *) value; if (ival == 0) { ival = MYSQLND_DEFAULT_PREFETCH_ROWS; } else if (ival > 1) { @@ -1960,7 +1960,7 @@ static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; - unsigned int i; + php_uint_t i; DBG_ENTER("mysqlnd_stmt_separate_result_bind"); if (!stmt) { @@ -2013,7 +2013,7 @@ mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt_separate_one_result_bind */ static void -mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const s, unsigned int param_no TSRMLS_DC) +mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const s, php_uint_t param_no TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; DBG_ENTER("mysqlnd_stmt_separate_one_result_bind"); @@ -2074,7 +2074,7 @@ MYSQLND_METHOD(mysqlnd_stmt, free_stmt_content)(MYSQLND_STMT * const s TSRMLS_DC /* Destroy the input bind */ if (stmt->param_bind) { - unsigned int i; + php_uint_t i; /* Because only the bound variables can point to our internal buffers, then separate or free only them. Free is possible because the user could have diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c index cc8ed54..2babd31 100644 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@ -54,8 +54,8 @@ struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST + 1]; /* {{{ ps_fetch_from_1_to_8_bytes */ void -ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, - zend_uchar ** row, unsigned int byte_count TSRMLS_DC) +ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, + zend_uchar ** row, php_uint_t byte_count TSRMLS_DC) { char tmp[22]; size_t tmp_len = 0; @@ -127,7 +127,7 @@ ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigne /* {{{ ps_fetch_null */ static void -ps_fetch_null(zval *zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_null(zval *zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ZVAL_NULL(zv); } @@ -136,7 +136,7 @@ ps_fetch_null(zval *zv, const MYSQLND_FIELD * const field, unsigned int pack_len /* {{{ ps_fetch_int8 */ static void -ps_fetch_int8(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int8(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 1 TSRMLS_CC); } @@ -145,7 +145,7 @@ ps_fetch_int8(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_le /* {{{ ps_fetch_int16 */ static void -ps_fetch_int16(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int16(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 2 TSRMLS_CC); } @@ -154,7 +154,7 @@ ps_fetch_int16(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_int32 */ static void -ps_fetch_int32(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int32(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 4 TSRMLS_CC); } @@ -163,7 +163,7 @@ ps_fetch_int32(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_int64 */ static void -ps_fetch_int64(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int64(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 8 TSRMLS_CC); } @@ -172,7 +172,7 @@ ps_fetch_int64(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_float */ static void -ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { float value; DBG_ENTER("ps_fetch_float"); @@ -187,7 +187,7 @@ ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_double */ static void -ps_fetch_double(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_double(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { double value; DBG_ENTER("ps_fetch_double"); @@ -202,7 +202,7 @@ ps_fetch_double(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_ /* {{{ ps_fetch_time */ static void -ps_fetch_time(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_time(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { struct st_mysqlnd_time t; php_uint_t length; /* First byte encodes the length*/ @@ -245,7 +245,7 @@ ps_fetch_time(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_le /* {{{ ps_fetch_date */ static void -ps_fetch_date(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_date(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { struct st_mysqlnd_time t = {0}; php_uint_t length; /* First byte encodes the length*/ @@ -282,7 +282,7 @@ ps_fetch_date(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_le /* {{{ ps_fetch_datetime */ static void -ps_fetch_datetime(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_datetime(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { struct st_mysqlnd_time t; php_uint_t length; /* First byte encodes the length*/ @@ -326,7 +326,7 @@ ps_fetch_datetime(zval * zv, const MYSQLND_FIELD * const field, unsigned int pac /* {{{ ps_fetch_string */ static void -ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { /* For now just copy, before we make it possible @@ -346,7 +346,7 @@ ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_ /* {{{ ps_fetch_bit */ static void -ps_fetch_bit(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_bit(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { php_uint_t length = php_mysqlnd_net_field_length(row); ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, length TSRMLS_CC); @@ -499,7 +499,7 @@ void _mysqlnd_init_ps_fetch_subsystem() /* {{{ mysqlnd_stmt_copy_it */ static enum_func_status -mysqlnd_stmt_copy_it(zval *** copies, zval * original, unsigned int param_count, unsigned int current TSRMLS_DC) +mysqlnd_stmt_copy_it(zval *** copies, zval * original, php_uint_t param_count, php_uint_t current TSRMLS_DC) { if (!*copies) { *copies = mnd_ecalloc(param_count, sizeof(zval *)); @@ -521,7 +521,7 @@ static enum_func_status mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar **p, size_t *buf_len TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s->data; - unsigned int i = 0; + php_uint_t i = 0; zend_uchar * provided_buffer = *buf; size_t left = (*buf_len - (*p - *buf)); size_t data_size = 0; @@ -533,7 +533,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar DBG_ENTER("mysqlnd_stmt_execute_store_params"); { - unsigned int null_count = (stmt->param_count + 7) / 8; + php_uint_t null_count = (stmt->param_count + 7) / 8; /* give it some reserved space - 20 bytes */ if (left < (null_count + 20)) { ptrdiff_t offset = *p - *buf; @@ -675,7 +675,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar /* 2. Store data */ /* 2.1 Calculate how much space we need */ for (i = 0; i < stmt->param_count; i++) { - unsigned int j; + php_uint_t j; zval *the_var = stmt->param_bind[i].zv; if (!the_var || (stmt->param_bind[i].type != MYSQL_TYPE_LONG_BLOB && Z_TYPE_P(the_var) == IS_NULL)) { diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index d5fcb39..90b6761 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -37,10 +37,10 @@ static enum_func_status MYSQLND_METHOD(mysqlnd_res, initialize_result_set_rest)(MYSQLND_RES * const result TSRMLS_DC) { - unsigned int i; + php_uint_t i; zval **data_cursor = result->stored_data? result->stored_data->data:NULL; zval **data_begin = result->stored_data? result->stored_data->data:NULL; - unsigned int field_count = result->meta? result->meta->field_count : 0; + php_uint_t field_count = result->meta? result->meta->field_count : 0; uint64_t row_count = result->stored_data? result->stored_data->row_count:0; enum_func_status ret = PASS; DBG_ENTER("mysqlnd_res::initialize_result_set_rest"); @@ -140,7 +140,7 @@ MYSQLND_METHOD(mysqlnd_res, unbuffered_free_last_data)(MYSQLND_RES * result TSRM } if (unbuf->last_row_data) { - unsigned int i, ctor_called_count = 0; + php_uint_t i, ctor_called_count = 0; zend_bool copy_ctor_called; MYSQLND_STATS *global_stats = result->conn? result->conn->stats:NULL; @@ -178,15 +178,15 @@ static void MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC) { MYSQLND_RES_BUFFERED *set = result->stored_data; - unsigned int field_count = result->field_count; + php_uint_t field_count = result->field_count; int64_t row; DBG_ENTER("mysqlnd_res::free_buffered_data"); DBG_INF_FMT("Freeing "MYSQLND_LLU_SPEC" row(s)", set->row_count); if (set->data) { - unsigned int copy_on_write_performed = 0; - unsigned int copy_on_write_saved = 0; + php_uint_t copy_on_write_performed = 0; + php_uint_t copy_on_write_saved = 0; for (row = set->row_count - 1; row >= 0; row--) { zval **current_row = set->data + row * field_count; @@ -510,7 +510,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s stmt->state = MYSQLND_STMT_INITTED; } } else { - unsigned int to_log = MYSQLND_G(log_mask); + php_uint_t to_log = MYSQLND_G(log_mask); to_log &= fields_eof->server_status; DBG_INF_FMT("warnings=%u server_status=%u", fields_eof->warning_count, fields_eof->server_status); conn->upsert_status->warning_count = fields_eof->warning_count; @@ -561,7 +561,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s static php_uint_t * mysqlnd_fetch_lengths_buffered(MYSQLND_RES * const result TSRMLS_DC) { - unsigned int i; + php_uint_t i; zval **previous_row; MYSQLND_RES_BUFFERED *set = result->stored_data; @@ -612,7 +612,7 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES * result TSRMLS_DC) { enum_func_status ret; MYSQLND_ROW_C retrow = NULL; - unsigned int i, + php_uint_t i, field_count = result->field_count; MYSQLND_PACKET_ROW *row_packet = result->row_packet; php_uint_t *lengths = result->lengths; @@ -669,7 +669,7 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES * result TSRMLS_DC) if (retrow) { for (i = 0; i < field_count; i++, field++, hash_key++) { zval *data = result->unbuf->last_row_data[i]; - unsigned int len; + php_size_t len; if (Z_TYPE_P(data) != IS_NULL) { convert_to_string(data); @@ -725,7 +725,7 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES * result TSRMLS_DC) /* {{{ mysqlnd_fetch_row_unbuffered */ static enum_func_status -mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { enum_func_status ret; zval *row = (zval *) param; @@ -767,7 +767,7 @@ mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, unsigned int fla HashTable *row_ht = Z_ARRVAL_P(row); MYSQLND_FIELD *field = result->meta->fields; struct mysqlnd_field_hash_key * hash_key = result->meta->zend_hash_keys; - unsigned int i, field_count = result->field_count; + php_uint_t i, field_count = result->field_count; php_uint_t *lengths = result->lengths; enum_func_status rc = result->m.row_decoder(result->unbuf->last_row_buffer, @@ -781,7 +781,7 @@ mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, unsigned int fla } for (i = 0; i < field_count; i++, field++, hash_key++) { zval *data = result->unbuf->last_row_data[i]; - unsigned int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRSIZE_P(data); + php_size_t len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRSIZE_P(data); if (lengths) { lengths[i] = len; @@ -924,7 +924,7 @@ mysqlnd_fetch_row_buffered_c(MYSQLND_RES * result TSRMLS_DC) zval **current_row = set->data_cursor; MYSQLND_FIELD *field = result->meta->fields; struct mysqlnd_field_hash_key * hash_key = result->meta->zend_hash_keys; - unsigned int i; + php_uint_t i; if (NULL == current_row[0]) { uint64_t row_num = (set->data_cursor - set->data) / result->meta->field_count; @@ -981,9 +981,9 @@ mysqlnd_fetch_row_buffered_c(MYSQLND_RES * result TSRMLS_DC) /* {{{ mysqlnd_fetch_row_buffered */ static enum_func_status -mysqlnd_fetch_row_buffered(MYSQLND_RES * result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_fetch_row_buffered(MYSQLND_RES * result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { - unsigned int i; + php_uint_t i; zval *row = (zval *) param; MYSQLND_RES_BUFFERED *set = result->stored_data; enum_func_status ret = FAIL; @@ -1080,7 +1080,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c { enum_func_status ret; MYSQLND_PACKET_ROW *row_packet = NULL; - unsigned int next_extend = STORE_RESULT_PREALLOCATED_SET_IF_NOT_EMPTY, free_rows = 1; + php_uint_t next_extend = STORE_RESULT_PREALLOCATED_SET_IF_NOT_EMPTY, free_rows = 1; MYSQLND_RES_BUFFERED *set; DBG_ENTER("mysqlnd_res::store_result_fetch_data"); @@ -1344,7 +1344,7 @@ MYSQLND_METHOD(mysqlnd_res, num_rows)(const MYSQLND_RES * const result TSRMLS_DC /* {{{ mysqlnd_res::num_fields */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_res, num_fields)(const MYSQLND_RES * const result TSRMLS_DC) { return result->field_count; @@ -1464,7 +1464,7 @@ MYSQLND_METHOD(mysqlnd_res, field_tell)(const MYSQLND_RES * const result TSRMLS_ /* {{{ mysqlnd_res::fetch_into */ static void -MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, unsigned int flags, +MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, php_uint_t flags, zval *return_value, enum_mysqlnd_extension extension TSRMLS_DC ZEND_FILE_LINE_DC) { @@ -1529,7 +1529,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_row_c)(MYSQLND_RES * result TSRMLS_DC) /* {{{ mysqlnd_res::fetch_all */ static void -MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) +MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, php_uint_t flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) { zval *row; php_uint_t i = 0; @@ -1547,7 +1547,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, unsigned int flags, } /* 4 is a magic value. The cast is safe, if larger then the array will be later extended - no big deal :) */ - mysqlnd_array_init(return_value, set? (unsigned int) set->row_count : 4); + mysqlnd_array_init(return_value, set? (php_uint_t) set->row_count : 4); do { MAKE_STD_ZVAL(row); @@ -1566,11 +1566,11 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, unsigned int flags, /* {{{ mysqlnd_res::fetch_field_data */ static void -MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, unsigned int offset, zval *return_value TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, php_uint_t offset, zval *return_value TSRMLS_DC) { zval row; zval **entry; - unsigned int i = 0; + php_uint_t i = 0; DBG_ENTER("mysqlnd_res::fetch_field_data"); DBG_INF_FMT("offset=%u", offset); @@ -1646,7 +1646,7 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_result_init */ PHPAPI MYSQLND_RES * -mysqlnd_result_init(unsigned int field_count, zend_bool persistent TSRMLS_DC) +mysqlnd_result_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC) { size_t alloc_size = sizeof(MYSQLND_RES) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_RES *ret = mnd_pecalloc(1, alloc_size, persistent); diff --git a/ext/mysqlnd/mysqlnd_result.h b/ext/mysqlnd/mysqlnd_result.h index 54f3b03..c647c02 100644 --- a/ext/mysqlnd/mysqlnd_result.h +++ b/ext/mysqlnd/mysqlnd_result.h @@ -23,7 +23,7 @@ #ifndef MYSQLND_RESULT_H #define MYSQLND_RESULT_H -PHPAPI MYSQLND_RES * mysqlnd_result_init(unsigned int field_count, zend_bool persistent TSRMLS_DC); +PHPAPI MYSQLND_RES * mysqlnd_result_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC); enum_func_status mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * stmt TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index e7b32c4..dbe670d 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@ -96,7 +96,7 @@ mysqlnd_is_key_numeric(const char * key, size_t length, php_int_t *idx) static enum_func_status MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const meta, MYSQLND_CONN_DATA * conn TSRMLS_DC) { - unsigned int i = 0; + php_uint_t i = 0; MYSQLND_PACKET_RES_FIELD * field_packet; DBG_ENTER("mysqlnd_res_meta::read_metadata"); @@ -202,7 +202,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met static void MYSQLND_METHOD(mysqlnd_res_meta, free)(MYSQLND_RES_METADATA * meta TSRMLS_DC) { - int i; + php_uint_t i; MYSQLND_FIELD *fields; DBG_ENTER("mysqlnd_res_meta::free"); DBG_INF_FMT("persistent=%u", meta->persistent); @@ -234,7 +234,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, free)(MYSQLND_RES_METADATA * meta TSRMLS_DC) static MYSQLND_RES_METADATA * MYSQLND_METHOD(mysqlnd_res_meta, clone_metadata)(const MYSQLND_RES_METADATA * const meta, zend_bool persistent TSRMLS_DC) { - unsigned int i; + php_uint_t i; /* +1 is to have empty marker at the end */ MYSQLND_RES_METADATA * new_meta = NULL; MYSQLND_FIELD * new_fields; @@ -386,7 +386,7 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_result_meta_init */ PHPAPI MYSQLND_RES_METADATA * -mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_DC) +mysqlnd_result_meta_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC) { size_t alloc_size = sizeof(MYSQLND_RES_METADATA) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_RES_METADATA *ret = mnd_pecalloc(1, alloc_size, persistent); diff --git a/ext/mysqlnd/mysqlnd_result_meta.h b/ext/mysqlnd/mysqlnd_result_meta.h index 97720ad..40d7c5b 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.h +++ b/ext/mysqlnd/mysqlnd_result_meta.h @@ -23,7 +23,7 @@ #ifndef MYSQLND_RESULT_META_H #define MYSQLND_RESULT_META_H -PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_DC); +PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC); PHPAPI struct st_mysqlnd_res_meta_methods * mysqlnd_result_metadata_get_methods(); PHPAPI void ** _mysqlnd_plugin_get_plugin_result_metadata_data(const MYSQLND_RES_METADATA * meta, unsigned int plugin_id TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index ce19327..b19baa8 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -199,7 +199,7 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) { - unsigned int i; + php_uint_t i; mysqlnd_array_init(return_value, stats->count); for (i = 0; i < stats->count; i++) { diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 2928cc0..51f9516 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -44,11 +44,11 @@ typedef struct st_mysqlnd_memory_pool_chunk_llist MYSQLND_MEMORY_POOL_CHUNK_LLIS struct st_mysqlnd_memory_pool { zend_uchar *arena; - unsigned int refcount; - unsigned int arena_size; - unsigned int free_size; + php_uint_t refcount; + php_size_t arena_size; + php_size_t free_size; - MYSQLND_MEMORY_POOL_CHUNK* (*get_chunk)(MYSQLND_MEMORY_POOL * pool, unsigned int size TSRMLS_DC); + MYSQLND_MEMORY_POOL_CHUNK* (*get_chunk)(MYSQLND_MEMORY_POOL * pool, php_size_t size TSRMLS_DC); }; struct st_mysqlnd_memory_pool_chunk @@ -56,8 +56,8 @@ struct st_mysqlnd_memory_pool_chunk size_t app; MYSQLND_MEMORY_POOL *pool; zend_uchar *ptr; - unsigned int size; - enum_func_status (*resize_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size TSRMLS_DC); + php_size_t size; + enum_func_status (*resize_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk, php_size_t size TSRMLS_DC); void (*free_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC); zend_bool from_pool; }; @@ -81,16 +81,16 @@ typedef struct st_mysqlnd_field char *def; /* Default value (set by mysql_list_fields) */ php_uint_t length; /* Width of column (create length) */ php_uint_t max_length; /* Max width for selected set */ - unsigned int name_length; - unsigned int org_name_length; - unsigned int table_length; - unsigned int org_table_length; - unsigned int db_length; - unsigned int catalog_length; - unsigned int def_length; - unsigned int flags; /* Diverse flags */ - unsigned int decimals; /* Number of decimals in field */ - unsigned int charsetnr; /* Character set */ + php_size_t name_length; + php_size_t org_name_length; + php_size_t table_length; + php_size_t org_table_length; + php_size_t db_length; + php_size_t catalog_length; + php_size_t def_length; + php_int_t flags; /* Diverse flags */ + php_int_t decimals; /* Number of decimals in field */ + php_int_t charsetnr; /* Character set */ enum mysqlnd_field_types type; /* Type of field. See mysql_com.h for types */ char *root; size_t root_len; @@ -99,8 +99,8 @@ typedef struct st_mysqlnd_field typedef struct st_mysqlnd_upsert_result { - unsigned int warning_count; - unsigned int server_status; + php_uint_t warning_count; + php_uint_t server_status; uint64_t affected_rows; uint64_t last_insert_id; } MYSQLND_UPSERT_STATUS; @@ -110,7 +110,7 @@ typedef struct st_mysqlnd_error_info { char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; zend_llist * error_list; } MYSQLND_ERROR_INFO; @@ -119,7 +119,7 @@ typedef struct st_mysqlnd_error_list_element { char * error; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; } MYSQLND_ERROR_LIST_ELEMENT; @@ -135,11 +135,11 @@ typedef struct st_mysqlnd_infile_info /* character set information */ typedef struct st_mysqlnd_charset { - unsigned int nr; + php_uint_t nr; const char *name; const char *collation; - unsigned int char_minlen; - unsigned int char_maxlen; + php_size_t char_minlen; + php_size_t char_maxlen; const char *comment; unsigned int (*mb_charlen)(unsigned int c); unsigned int (*mb_valid)(const char *start, const char *end); @@ -150,8 +150,8 @@ typedef struct st_mysqlnd_charset typedef struct st_mysqlnd_infile { int (*local_infile_init)(void **ptr, char *filename, void **userdata TSRMLS_DC); - int (*local_infile_read)(void *ptr, zend_uchar * buf, unsigned int buf_len TSRMLS_DC); - int (*local_infile_error)(void *ptr, char *error_msg, unsigned int error_msg_len TSRMLS_DC); + int (*local_infile_read)(void *ptr, zend_uchar * buf, php_size_t buf_len TSRMLS_DC); + int (*local_infile_error)(void *ptr, char *error_msg, php_size_t error_msg_len TSRMLS_DC); void (*local_infile_end)(void *ptr TSRMLS_DC); zval *callback; void *userdata; @@ -162,7 +162,7 @@ typedef struct st_mysqlnd_options ulong flags; /* init commands - we need to send them to server directly after connect */ - unsigned int num_commands; + php_uint_t num_commands; char **init_commands; /* configuration file information */ @@ -194,9 +194,9 @@ typedef struct st_mysqlnd_options typedef struct st_mysqlnd_net_options { /* timeouts */ - unsigned int timeout_connect; - unsigned int timeout_read; - unsigned int timeout_write; + php_uint_t timeout_connect; + php_uint_t timeout_read; + php_uint_t timeout_write; size_t net_read_buffer_size; @@ -228,7 +228,7 @@ typedef struct st_mysqlnd_res MYSQLND_RES; typedef char** MYSQLND_ROW_C; /* return data as array of strings */ typedef struct st_mysqlnd_stmt_data MYSQLND_STMT_DATA; typedef struct st_mysqlnd_stmt MYSQLND_STMT; -typedef unsigned int MYSQLND_FIELD_OFFSET; +typedef php_uint_t MYSQLND_FIELD_OFFSET; typedef struct st_mysqlnd_param_bind MYSQLND_PARAM_BIND; @@ -244,7 +244,7 @@ typedef struct st_mysqlnd_debug MYSQLND_DEBUG; typedef MYSQLND_RES* (*mysqlnd_stmt_use_or_store_func)(MYSQLND_STMT * const TSRMLS_DC); typedef enum_func_status (*mysqlnd_fetch_row_func)(MYSQLND_RES *result, void *param, - unsigned int flags, + php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC); @@ -411,11 +411,11 @@ struct st_mysqlnd_object_factory_methods typedef enum_func_status (*func_mysqlnd_conn_data__init)(MYSQLND_CONN_DATA * conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__connect)(MYSQLND_CONN_DATA * conn, const char * host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__connect)(MYSQLND_CONN_DATA * conn, const char * host, const char * user, const char * passwd, php_size_t passwd_len, const char * db, php_size_t db_len, php_uint_t port, const char * socket_or_pipe, php_int_t mysql_flags TSRMLS_DC); typedef php_uint_t (*func_mysqlnd_conn_data__escape_string)(MYSQLND_CONN_DATA * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__set_charset)(MYSQLND_CONN_DATA * const conn, const char * const charset TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__send_query)(MYSQLND_CONN_DATA * conn, const char *query, unsigned int query_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__query)(MYSQLND_CONN_DATA * conn, const char * query, php_size_t query_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__send_query)(MYSQLND_CONN_DATA * conn, const char *query, php_size_t query_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__reap_query)(MYSQLND_CONN_DATA * conn TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_conn_data__use_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_conn_data__store_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); @@ -428,12 +428,12 @@ typedef enum_func_status (*func_mysqlnd_conn_data__shutdown_server)(MYSQLND_CONN typedef enum_func_status (*func_mysqlnd_conn_data__refresh_server)(MYSQLND_CONN_DATA * const conn, uint8_t options TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__ping)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__kill_connection)(MYSQLND_CONN_DATA * conn, unsigned int pid TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, unsigned int db_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__kill_connection)(MYSQLND_CONN_DATA * conn, php_uint_t pid TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, php_size_t db_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__server_dump_debug_information)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__change_user)(MYSQLND_CONN_DATA * const conn, const char * user, const char * passwd, const char * db, zend_bool silent, size_t passwd_len TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_error_no)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_error_no)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_error_str)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_sqlstate)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef uint64_t (*func_mysqlnd_conn_data__get_thread_id)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); @@ -441,9 +441,9 @@ typedef void (*func_mysqlnd_conn_data__get_statistics)(const MYSQLND_CONN_DAT typedef php_uint_t (*func_mysqlnd_conn_data__get_server_version)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_server_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__get_server_statistics)(MYSQLND_CONN_DATA * conn, char **message, unsigned int * message_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__get_server_statistics)(MYSQLND_CONN_DATA * conn, char **message, php_size_t * message_len TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_host_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_protocol_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_protocol_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_last_message)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__charset_name)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_conn_data__list_fields)(MYSQLND_CONN_DATA * conn, const char * table, const char * achtung_wild TSRMLS_DC); @@ -451,11 +451,11 @@ typedef MYSQLND_RES * (*func_mysqlnd_conn_data__list_method)(MYSQLND_CONN_DATA typedef uint64_t (*func_mysqlnd_conn_data__get_last_insert_id)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef uint64_t (*func_mysqlnd_conn_data__get_affected_rows)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_warning_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_warning_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_field_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_field_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_server_status)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_server_status)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__set_server_option)(MYSQLND_CONN_DATA * const conn, enum_mysqlnd_server_option option TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__set_client_option)(MYSQLND_CONN_DATA * const conn, enum_mysqlnd_option option, const char * const value TSRMLS_DC); typedef void (*func_mysqlnd_conn_data__free_contents)(MYSQLND_CONN_DATA * conn TSRMLS_DC);/* private */ @@ -478,22 +478,22 @@ typedef enum_func_status (*func_mysqlnd_conn_data__send_close)(MYSQLND_CONN_DATA typedef enum_func_status (*func_mysqlnd_conn_data__ssl_set)(MYSQLND_CONN_DATA * const conn, const char * key, const char * const cert, const char * const ca, const char * const capath, const char * const cipher TSRMLS_DC); -typedef MYSQLND_RES * (*func_mysqlnd_conn_data__result_init)(unsigned int field_count, zend_bool persistent TSRMLS_DC); +typedef MYSQLND_RES * (*func_mysqlnd_conn_data__result_init)(php_uint_t field_count, zend_bool persistent TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__set_autocommit)(MYSQLND_CONN_DATA * conn, unsigned int mode TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__set_autocommit)(MYSQLND_CONN_DATA * conn, php_uint_t mode TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit)(MYSQLND_CONN_DATA * conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_rollback)(MYSQLND_CONN_DATA * conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__tx_begin)(MYSQLND_CONN_DATA * conn, const unsigned int mode, const char * const name TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const unsigned int flags, const char * const name TSRMLS_DC); -typedef void (*func_mysqlnd_conn_data__tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * tmp_str, const unsigned int mode TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__tx_begin)(MYSQLND_CONN_DATA * conn, const php_uint_t mode, const char * const name TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const php_int_t flags, const char * const name TSRMLS_DC); +typedef void (*func_mysqlnd_conn_data__tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * tmp_str, const php_int_t mode TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_savepoint)(MYSQLND_CONN_DATA * conn, const char * const name TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_savepoint_release)(MYSQLND_CONN_DATA * conn, const char * const name TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__local_tx_start)(MYSQLND_CONN_DATA * conn, size_t this_func TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__local_tx_end)(MYSQLND_CONN_DATA * conn, size_t this_func, enum_func_status status TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__execute_init_commands)(MYSQLND_CONN_DATA * conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, unsigned int mysql_flags TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__connect_handshake)(MYSQLND_CONN_DATA * conn, const char * const host, const char * const user, const char * const passwd, const unsigned int passwd_len, const char * const db, const unsigned int db_len, const unsigned int mysql_flags TSRMLS_DC); +typedef php_int_t (*func_mysqlnd_conn_data__get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, php_int_t mysql_flags TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__connect_handshake)(MYSQLND_CONN_DATA * conn, const char * const host, const char * const user, const char * const passwd, const php_size_t passwd_len, const char * const db, const php_size_t db_len, const php_int_t mysql_flags TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__simple_command_send_request)(MYSQLND_CONN_DATA * conn, enum php_mysqlnd_server_command command, const zend_uchar * const arg, size_t arg_len, zend_bool silent, zend_bool ignore_upsert_status TSRMLS_DC); typedef struct st_mysqlnd_authentication_plugin * (*func_mysqlnd_conn_data__fetch_auth_plugin_by_name)(const char * const requested_protocol TSRMLS_DC); @@ -593,7 +593,7 @@ struct st_mysqlnd_conn_data_methods }; -typedef enum_func_status (*func_mysqlnd_data__connect)(MYSQLND * conn, const char * host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_data__connect)(MYSQLND * conn, const char * host, const char * user, const char * passwd, php_size_t passwd_len, const char * db, php_size_t db_len, php_uint_t port, const char * socket_or_pipe, php_uint_t mysql_flags TSRMLS_DC); typedef MYSQLND * (*func_mysqlnd_conn__clone_object)(MYSQLND * const conn TSRMLS_DC); typedef void (*func_mysqlnd_conn__dtor)(MYSQLND * conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn__close)(MYSQLND * conn, enum_connection_close_type close_type TSRMLS_DC); @@ -613,12 +613,12 @@ typedef mysqlnd_fetch_row_func fetch_row_normal_unbuffered; /* private */ typedef MYSQLND_RES * (*func_mysqlnd_res__use_result)(MYSQLND_RES * const result, zend_bool ps_protocol TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_res__store_result)(MYSQLND_RES * result, MYSQLND_CONN_DATA * const conn, zend_bool ps TSRMLS_DC); -typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, unsigned int flags, zval *return_value, enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC); +typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, php_uint_t flags, zval *return_value, enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC); typedef MYSQLND_ROW_C (*func_mysqlnd_res__fetch_row_c)(MYSQLND_RES *result TSRMLS_DC); -typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); -typedef void (*func_mysqlnd_res__fetch_field_data)(MYSQLND_RES *result, unsigned int offset, zval *return_value TSRMLS_DC); +typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, php_uint_t flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); +typedef void (*func_mysqlnd_res__fetch_field_data)(MYSQLND_RES *result, php_uint_t offset, zval *return_value TSRMLS_DC); typedef uint64_t (*func_mysqlnd_res__num_rows)(const MYSQLND_RES * const result TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_res__skip_result)(MYSQLND_RES * const result TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_res__seek_data)(MYSQLND_RES * result, uint64_t row TSRMLS_DC); typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__seek_field)(MYSQLND_RES * const result, MYSQLND_FIELD_OFFSET field_offset TSRMLS_DC); @@ -641,10 +641,10 @@ typedef void (*func_mysqlnd_res__unbuffered_free_last_data)(MYSQLND_RES *resu /* for decoding - binary or text protocol */ typedef enum_func_status (*func_mysqlnd_res__row_decoder)(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC); -typedef MYSQLND_RES_METADATA * (*func_mysqlnd_res__result_meta_init)(unsigned int field_count, zend_bool persistent TSRMLS_DC); +typedef MYSQLND_RES_METADATA * (*func_mysqlnd_res__result_meta_init)(php_uint_t field_count, zend_bool persistent TSRMLS_DC); struct st_mysqlnd_res_methods { @@ -711,7 +711,7 @@ struct st_mysqlnd_res_meta_methods }; -typedef enum_func_status (*func_mysqlnd_stmt__prepare)(MYSQLND_STMT * const stmt, const char * const query, unsigned int query_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__prepare)(MYSQLND_STMT * const stmt, const char * const query, php_size_t query_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__execute)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__use_result)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__store_result)(MYSQLND_STMT * const stmt TSRMLS_DC); @@ -725,20 +725,20 @@ typedef enum_func_status (*func_mysqlnd_stmt__net_close)(MYSQLND_STMT * const st typedef enum_func_status (*func_mysqlnd_stmt__dtor)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /* use this for mysqlnd_stmt_close */ typedef enum_func_status (*func_mysqlnd_stmt__fetch)(MYSQLND_STMT * const stmt, zend_bool * const fetched_anything TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__bind_parameters)(MYSQLND_STMT * const stmt, MYSQLND_PARAM_BIND * const param_bind TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_stmt__bind_one_parameter)(MYSQLND_STMT * const stmt, unsigned int param_no, zval * const zv, zend_uchar type TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__bind_one_parameter)(MYSQLND_STMT * const stmt, php_uint_t param_no, zval * const zv, zend_uchar type TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__refresh_bind_param)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__bind_result)(MYSQLND_STMT * const stmt, MYSQLND_RESULT_BIND * const result_bind TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_stmt__bind_one_result)(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_stmt__send_long_data)(MYSQLND_STMT * const stmt, unsigned int param_num, const char * const data, php_uint_t length TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__bind_one_result)(MYSQLND_STMT * const stmt, php_uint_t param_no TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__send_long_data)(MYSQLND_STMT * const stmt, php_uint_t param_num, const char * const data, php_uint_t length TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__get_parameter_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__get_result_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef uint64_t (*func_mysqlnd_stmt__get_last_insert_id)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef uint64_t (*func_mysqlnd_stmt__get_affected_rows)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef uint64_t (*func_mysqlnd_stmt__get_num_rows)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_param_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_field_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_warning_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_error_no)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_param_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_field_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_warning_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_error_no)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef const char * (*func_mysqlnd_stmt__get_error_str)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef const char * (*func_mysqlnd_stmt__get_sqlstate)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__get_attribute)(const MYSQLND_STMT * const stmt, enum mysqlnd_stmt_attr attr_type, void * const value TSRMLS_DC); @@ -747,7 +747,7 @@ typedef MYSQLND_PARAM_BIND *(*func_mysqlnd_stmt__alloc_param_bind)(MYSQLND_STMT typedef MYSQLND_RESULT_BIND*(*func_mysqlnd_stmt__alloc_result_bind)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef void (*func_mysqlnd_stmt__free_parameter_bind)(MYSQLND_STMT * const stmt, MYSQLND_PARAM_BIND * TSRMLS_DC); typedef void (*func_mysqlnd_stmt__free_result_bind)(MYSQLND_STMT * const stmt, MYSQLND_RESULT_BIND * TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__server_status)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__server_status)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__generate_execute_request)(MYSQLND_STMT * const s, zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__parse_execute_response)(MYSQLND_STMT * const s TSRMLS_DC); typedef void (*func_mysqlnd_stmt__free_stmt_content)(MYSQLND_STMT * const s TSRMLS_DC); @@ -822,7 +822,7 @@ struct st_mysqlnd_net_data #endif MYSQLND_NET_OPTIONS options; - unsigned int refcount; + php_uint_t refcount; zend_bool persistent; @@ -866,15 +866,15 @@ struct st_mysqlnd_connection_data /* Information related */ char *host; - unsigned int host_len; + php_size_t host_len; char *unix_socket; - unsigned int unix_socket_len; + php_size_t unix_socket_len; char *user; - unsigned int user_len; + php_size_t user_len; char *passwd; - unsigned int passwd_len; + php_size_t passwd_len; char *scheme; - unsigned int scheme_len; + php_size_t scheme_len; uint64_t thread_id; char *server_version; char *host_info; @@ -883,11 +883,11 @@ struct st_mysqlnd_connection_data const MYSQLND_CHARSET *charset; const MYSQLND_CHARSET *greet_charset; char *connect_or_select_db; - unsigned int connect_or_select_db_len; + php_size_t connect_or_select_db_len; MYSQLND_INFILE infile; - unsigned int protocol_version; + php_uint_t protocol_version; php_uint_t max_packet_size; - unsigned int port; + php_uint_t port; php_uint_t client_flag; php_uint_t server_capabilities; @@ -895,7 +895,7 @@ struct st_mysqlnd_connection_data MYSQLND_UPSERT_STATUS * upsert_status; MYSQLND_UPSERT_STATUS upsert_status_impl; char *last_message; - unsigned int last_message_len; + php_size_t last_message_len; /* If error packet, we use these */ MYSQLND_ERROR_INFO * error_info; @@ -917,10 +917,10 @@ struct st_mysqlnd_connection_data The result set objects can determine by inspecting 'quit_sent' whether the connection is still valid. */ - unsigned int refcount; + php_uint_t refcount; /* Temporal storage for mysql_query */ - unsigned int field_count; + php_uint_t field_count; /* persistent connection */ zend_bool persistent; @@ -955,10 +955,10 @@ struct st_mysqlnd_result_metadata { MYSQLND_FIELD *fields; struct mysqlnd_field_hash_key *zend_hash_keys; - unsigned int current_field; - unsigned int field_count; + php_uint_t current_field; + php_uint_t field_count; /* We need this to make fast allocs in rowp_read */ - unsigned int bit_fields_count; + php_uint_t bit_fields_count; size_t bit_fields_total_len; /* trailing \0 not counted */ zend_bool persistent; @@ -974,7 +974,7 @@ struct st_mysqlnd_buffered_result uint64_t row_count; uint64_t initialized_rows; - unsigned int references; + php_uint_t references; MYSQLND_ERROR_INFO error_info; }; @@ -995,7 +995,7 @@ struct st_mysqlnd_res { MYSQLND_CONN_DATA *conn; enum_mysqlnd_res_type type; - unsigned int field_count; + php_uint_t field_count; /* For metadata functions */ MYSQLND_RES_METADATA *meta; @@ -1039,10 +1039,10 @@ struct st_mysqlnd_stmt_data php_uint_t stmt_id; php_uint_t flags;/* cursor is set here */ enum_mysqlnd_stmt_state state; - unsigned int warning_count; + php_uint_t warning_count; MYSQLND_RES *result; - unsigned int field_count; - unsigned int param_count; + php_uint_t field_count; + php_uint_t param_count; unsigned char send_types_to_server; MYSQLND_PARAM_BIND *param_bind; MYSQLND_RESULT_BIND *result_bind; @@ -1062,7 +1062,7 @@ struct st_mysqlnd_stmt_data mysqlnd_stmt_use_or_store_func default_rset_handler; MYSQLND_CMD_BUFFER execute_cmd_buffer; - unsigned int execute_count;/* count how many times the stmt was executed */ + php_uint_t execute_count;/* count how many times the stmt was executed */ }; @@ -1083,7 +1083,7 @@ typedef struct st_mysqlnd_string struct st_mysqlnd_plugin_header { - unsigned int plugin_api_version; + php_uint_t plugin_api_version; const char * plugin_name; php_uint_t plugin_version; const char * plugin_string_version; @@ -1112,7 +1112,7 @@ struct st_mysqlnd_typeii_plugin_example { struct st_mysqlnd_plugin_header plugin_header; void * methods; - unsigned int counter; + php_uint_t counter; }; struct st_mysqlnd_authentication_plugin; diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 52ab703..2e0b51c 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -232,12 +232,12 @@ php_mysqlnd_net_store_length_size(uint64_t length) /* {{{ php_mysqlnd_read_error_from_line */ static enum_func_status -php_mysqlnd_read_error_from_line(zend_uchar *buf, size_t buf_len, - char *error, int error_buf_len, - unsigned int *error_no, char *sqlstate TSRMLS_DC) +php_mysqlnd_read_error_from_line(zend_uchar *buf, php_size_t buf_len, + char *error, php_size_t error_buf_len, + php_uint_t *error_no, char *sqlstate TSRMLS_DC) { zend_uchar *p = buf; - int error_msg_len= 0; + php_size_t error_msg_len= 0; DBG_ENTER("php_mysqlnd_read_error_from_line"); @@ -970,7 +970,7 @@ size_t php_mysqlnd_cmd_write(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) /* Let's have some space, which we can use, if not enough, we will allocate new buffer */ MYSQLND_PACKET_COMMAND * packet= (MYSQLND_PACKET_COMMAND *) _packet; MYSQLND_NET * net = conn->net; - unsigned int error_reporting = EG(error_reporting); + php_uint_t error_reporting = EG(error_reporting); size_t sent = 0; DBG_ENTER("php_mysqlnd_cmd_write"); @@ -1193,7 +1193,7 @@ php_mysqlnd_rset_field_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) char *root_ptr; php_uint_t len; MYSQLND_FIELD *meta; - unsigned int i, field_count = sizeof(rset_field_offsets)/sizeof(size_t); + php_uint_t i, field_count = sizeof(rset_field_offsets)/sizeof(size_t); DBG_ENTER("php_mysqlnd_rset_field_read"); @@ -1477,10 +1477,10 @@ php_mysqlnd_read_row_ex(MYSQLND_CONN_DATA * conn, MYSQLND_MEMORY_POOL * result_s /* {{{ php_mysqlnd_rowp_read_binary_protocol */ enum_func_status php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC) { - unsigned int i; + php_uint_t i; zend_uchar * p = row_buffer->ptr; zend_uchar * null_ptr, bit; zval **current_field, **end_field, **start_field; @@ -1575,10 +1575,10 @@ php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zv /* {{{ php_mysqlnd_rowp_read_text_protocol */ enum_func_status php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC) { - unsigned int i; + php_uint_t i; zend_bool last_field_was_string = FALSE; zval **current_field, **end_field, **start_field; zend_uchar * p = row_buffer->ptr; @@ -1931,7 +1931,7 @@ php_mysqlnd_prepare_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) zend_uchar *buf = (zend_uchar *) conn->net->cmd_buffer.buffer; zend_uchar *p = buf; zend_uchar *begin = buf; - unsigned int data_size; + php_size_t data_size; MYSQLND_PACKET_PREPARE_RESPONSE *packet= (MYSQLND_PACKET_PREPARE_RESPONSE *) _packet; DBG_ENTER("php_mysqlnd_prepare_read"); diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 2e74230..1c9c418 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -82,7 +82,7 @@ typedef struct st_mysqlnd_packet_greet { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; char *auth_protocol; } MYSQLND_PACKET_GREET; @@ -119,7 +119,7 @@ typedef struct st_mysqlnd_packet_auth_response { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; char *new_auth_protocol; size_t new_auth_protocol_len; @@ -149,7 +149,7 @@ typedef struct st_mysqlnd_packet_ok { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; } MYSQLND_PACKET_OK; @@ -171,7 +171,7 @@ typedef struct st_mysqlnd_packet_eof { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; } MYSQLND_PACKET_EOF; /* EOF packet */ @@ -236,7 +236,7 @@ typedef struct st_mysqlnd_packet_row { zend_bool persistent_alloc; MYSQLND_FIELD *fields_metadata; /* We need this to alloc bigger bufs in non-PS mode */ - unsigned int bit_fields_count; + php_uint_t bit_fields_count; size_t bit_fields_total_len; /* trailing \0 not counted */ /* If error packet, we use these */ @@ -259,9 +259,9 @@ typedef struct st_mysqlnd_packet_prepare_response { /* also known as field_count 0x00=OK , 0xFF=error */ unsigned char error_code; php_uint_t stmt_id; - unsigned int field_count; - unsigned int param_count; - unsigned int warning_count; + php_uint_t field_count; + php_uint_t param_count; + php_uint_t warning_count; /* present in case of error */ MYSQLND_ERROR_INFO error_info; @@ -307,12 +307,12 @@ PHPAPI const extern char * const mysqlnd_empty_string; enum_func_status php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC); enum_func_status php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC); diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 48f3533..d590ecc 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -547,7 +547,7 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, php_int_t colno, in { struct pdo_column_data *col; char *value = NULL; - php_uint_t value_len = 0; + php_size_t value_len = 0; int caller_frees = 0; int type, new_type; @@ -880,7 +880,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, } if (return_value) { - int i = 0; + php_int_t i = 0; if (how == PDO_FETCH_LAZY) { get_lazy_object(stmt, return_value TSRMLS_CC); diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index 8be4612..bdba281 100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -566,7 +566,7 @@ struct _pdo_stmt_t { * the statement has been executed at least once. In some cases, might * not be valid until fetch (at the driver level) has been called at least once. * */ - int column_count; + php_uint_t column_count; struct pdo_column_data *columns; /* we want to keep the dbh alive while we live, so we own a reference */ diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 75b8619..2cb95bd 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -43,7 +43,7 @@ #endif /* {{{ _pdo_mysql_error */ -int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC) +php_uint_t _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC) { pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data; pdo_error_type *pdo_err; @@ -436,7 +436,7 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, php_int_t attr, zval *return_ case PDO_ATTR_SERVER_INFO: { char *tmp; #if defined(PDO_USE_MYSQLND) - unsigned int tmp_len; + php_size_t tmp_len; if (mysqlnd_stat(H->server, &tmp, &tmp_len) == PASS) { ZVAL_STRINGL(return_value, tmp, tmp_len, 0); diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 477218d..6617826 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -92,7 +92,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql) typedef struct { const char *file; int line; - unsigned int errcode; + php_uint_t errcode; char *errmsg; } pdo_mysql_error_info; @@ -132,7 +132,7 @@ typedef struct { #else MYSQL_STMT *stmt; #endif - int num_params; + php_uint_t num_params; PDO_MYSQL_PARAM_BIND *params; #ifndef PDO_USE_MYSQLND my_bool *in_null; @@ -142,12 +142,12 @@ typedef struct { my_bool *out_null; php_uint_t *out_length; unsigned int params_given; - unsigned max_length:1; + php_size_t max_length:1; } pdo_mysql_stmt; extern pdo_driver_t pdo_mysql_driver; -extern int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC); +extern php_uint_t _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC); #define pdo_mysql_error(s) _pdo_mysql_error(s, NULL, __FILE__, __LINE__ TSRMLS_CC) #define pdo_mysql_error_stmt(s) _pdo_mysql_error(stmt->dbh, stmt, __FILE__, __LINE__ TSRMLS_CC)
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index ad209dd..2b9e5c3 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1297,7 +1297,7 @@ PHP_FUNCTION(mysql_stat) php_mysql_conn *mysql; char *stat; #ifdef MYSQL_USE_MYSQLND - uint stat_len; + php_size_t stat_len; #endif if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1444,7 +1444,7 @@ PHP_FUNCTION(mysql_drop_db) /* {{{ php_mysql_do_query_general */ -static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_link, int link_id, char *db, int use_store, zval *return_value TSRMLS_DC) +static void php_mysql_do_query_general(char *query, php_size_t query_len, zval *mysql_link, php_int_t link_id, char *db, int use_store, zval *return_value TSRMLS_DC) { php_mysql_conn *mysql; MYSQL_RES *mysql_result; @@ -2299,8 +2299,7 @@ PHP_FUNCTION(mysql_fetch_lengths) zval *result; MYSQL_RES *mysql_result; mysql_row_length_type *lengths; - int num_fields; - int i; + php_int_t num_fields, i; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) { return; diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index eb747b9..115660f 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -679,9 +679,9 @@ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, co { char * commented_name = NULL; - unsigned int commented_name_len = name? spprintf(&commented_name, 0, " /*%s*/", name):0; + php_size_t commented_name_len = name? spprintf(&commented_name, 0, " /*%s*/", name):0; char * query; - unsigned int query_len = spprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), + php_size_t query_len = spprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); smart_str_free(&tmp_str); @@ -1656,7 +1656,7 @@ PHP_FUNCTION(mysqli_num_rows) /* }}} */ /* {{{ mysqli_options_get_option_zval_type */ -static int mysqli_options_get_option_zval_type(int option) +static int mysqli_options_get_option_zval_type(php_int_t option) { switch (option) { #ifdef MYSQLI_USE_MYSQLND @@ -1734,7 +1734,7 @@ PHP_FUNCTION(mysqli_options) zval *mysql_link = NULL; zval **mysql_value; php_int_t mysql_option; - unsigned int l_value; + php_int_t l_value; php_int_t ret; int expected_type; @@ -2239,7 +2239,7 @@ PHP_FUNCTION(mysqli_stat) zval *mysql_link; char *stat; #if defined(MYSQLI_USE_MYSQLND) - uint stat_len; + php_size_t stat_len; #endif if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c index a577161..a7300d2 100644 --- a/ext/mysqli/mysqli_exception.c +++ b/ext/mysqli/mysqli_exception.c @@ -36,7 +36,7 @@ const zend_function_entry mysqli_exception_methods[] = { }; /* }}} */ -void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...) +void php_mysqli_throw_sql_exception(char *sqlstate, php_int_t errorno TSRMLS_DC, char *format, ...) { zval *sql_ex; va_list arg; diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 666650a..2eb04e3 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -784,6 +784,10 @@ PHP_FUNCTION(mysqli_poll) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Negative values passed for sec and/or usec"); RETURN_FALSE; } + if (sec > LONG_MAX || usec > LONG_MAX) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Values passed for sec and/or usec are too long"); + RETURN_FALSE; + } if (!r_array && !e_array) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "No stream arrays were passed"); @@ -995,7 +999,7 @@ PHP_FUNCTION(mysqli_get_charset) MY_MYSQL *mysql; zval *mysql_link; const char *name = NULL, *collation = NULL, *dir = NULL, *comment = NULL; - uint minlength, maxlength, number, state; + php_uint_t minlength, maxlength, number, state; #if !defined(MYSQLI_USE_MYSQLND) MY_CHARSET_INFO cs; #else diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h index 2300516..257679c 100644 --- a/ext/mysqli/mysqli_priv.h +++ b/ext/mysqli/mysqli_priv.h @@ -74,9 +74,9 @@ extern MYSQLI_WARNING *php_get_warnings(MYSQL * mysql TSRMLS_DC); extern void php_clear_warnings(MYSQLI_WARNING *w); extern void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type); -extern void php_mysqli_report_error(const char *sqlstate, int errorno, const char *error TSRMLS_DC); -extern void php_mysqli_report_index(const char *query, unsigned int status TSRMLS_DC); -extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...); +extern void php_mysqli_report_error(const char *sqlstate, php_int_t errorno, const char *error TSRMLS_DC); +extern void php_mysqli_report_index(const char *query, php_uint_t status TSRMLS_DC); +extern void php_mysqli_throw_sql_exception(char *sqlstate, php_int_t errorno TSRMLS_DC, char *format, ...); #ifdef HAVE_SPL extern PHPAPI zend_class_entry *spl_ce_RuntimeException; @@ -105,7 +105,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML } else { \ char *ret; \ /* always used with my_ulonglong -> %llu */ \ - int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (__val)); \ + php_size_t l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (__val)); \ RETURN_STRINGL(ret, l, 0); \ } \ } diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 65384b0..fcddf4e 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -88,7 +88,7 @@ static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \ ZVAL_INT(*retval, (php_int_t) l);\ } else { \ char *ret; \ - int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \ + php_size_t ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \ ZVAL_STRINGL(*retval, ret, ret_len, 0); \ } \ }\ @@ -182,7 +182,7 @@ static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) ZVAL_INT(*retval, (php_int_t) rc); } else { char *ret; - int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); + php_size_t l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); ZVAL_STRINGL(*retval, ret, l, 0); } } @@ -271,7 +271,7 @@ static int link_stat_read(mysqli_object *obj, zval **retval TSRMLS_DC) if (mysql) { char * stat_msg; #if defined(MYSQLI_USE_MYSQLND) - uint stat_msg_len; + php_size_t stat_msg_len; if (mysqlnd_stat(mysql->mysql, &stat_msg, &stat_msg_len) == PASS) { ZVAL_STRINGL(*retval, stat_msg, stat_msg_len, 0); } @@ -382,7 +382,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) ZVAL_INT(*retval, (php_int_t) rc); } else { char *ret; - int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); + php_size_t l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); ZVAL_STRINGL(*retval, ret, l, 0); } } diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index c4ffd1c..e85b52f 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -27,7 +27,7 @@ #include "ext/standard/info.h" #include "php_mysqli_structs.h" -extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...); +extern void php_mysqli_throw_sql_exception(char *sqlstate, php_int_t errorno TSRMLS_DC, char *format, ...); /* {{{ proto bool mysqli_report(int flags) sets report level */ @@ -47,14 +47,14 @@ PHP_FUNCTION(mysqli_report) /* }}} */ /* {{{ void php_mysqli_report_error(char *sqlstate, int errorno, char *error) */ -void php_mysqli_report_error(const char *sqlstate, int errorno, const char *error TSRMLS_DC) +void php_mysqli_report_error(const char *sqlstate, php_int_t errorno, const char *error TSRMLS_DC) { php_mysqli_throw_sql_exception((char *)sqlstate, errorno TSRMLS_CC, "%s", error); } /* }}} */ /* {{{ void php_mysqli_report_index() */ -void php_mysqli_report_index(const char *query, unsigned int status TSRMLS_DC) { +void php_mysqli_report_index(const char *query, php_uint_t status TSRMLS_DC) { char index[15]; if (status & SERVER_QUERY_NO_GOOD_INDEX_USED) { diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index bfb6f36..d1f057e 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -80,7 +80,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, free_options)(MYSQLND_CONN_DATA * conn TSRMLS_ conn->options->auth_protocol = NULL; } if (conn->options->num_commands) { - unsigned int i; + php_uint_t i; for (i = 0; i < conn->options->num_commands; i++) { /* allocated with pestrdup */ mnd_pefree(conn->options->init_commands[i], pers); @@ -519,7 +519,7 @@ mysqlnd_run_authentication( const zend_uchar * const auth_plugin_data, const size_t auth_plugin_data_len, const char * const auth_protocol, - unsigned int charset_no, + php_uint_t charset_no, const MYSQLND_OPTIONS * const options, php_uint_t mysql_flags, zend_bool silent, @@ -678,7 +678,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, execute_init_commands)(MYSQLND_CONN_DATA * con DBG_ENTER("mysqlnd_conn_data::execute_init_commands"); if (conn->options->init_commands) { - unsigned int current_command = 0; + php_uint_t current_command = 0; for (; current_command < conn->options->num_commands; ++current_command) { const char * const command = conn->options->init_commands[current_command]; if (command) { @@ -703,8 +703,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, execute_init_commands)(MYSQLND_CONN_DATA * con /* {{{ mysqlnd_conn_data::get_updated_connect_flags */ -static unsigned int -MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, unsigned int mysql_flags TSRMLS_DC) +static php_int_t +MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, php_int_t mysql_flags TSRMLS_DC) { MYSQLND_NET * net = conn->net; @@ -748,9 +748,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * static enum_func_status MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn, const char * const host, const char * const user, - const char * const passwd, const unsigned int passwd_len, - const char * const db, const unsigned int db_len, - const unsigned int mysql_flags TSRMLS_DC) + const char * const passwd, const php_size_t passwd_len, + const char * const db, const php_size_t db_len, + const php_int_t mysql_flags TSRMLS_DC) { MYSQLND_PACKET_GREET * greet_packet; MYSQLND_NET * net = conn->net; @@ -829,11 +829,11 @@ err: static enum_func_status MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, const char *host, const char *user, - const char *passwd, unsigned int passwd_len, - const char *db, unsigned int db_len, - unsigned int port, + const char *passwd, php_size_t passwd_len, + const char *db, php_size_t db_len, + php_uint_t port, const char *socket_or_pipe, - unsigned int mysql_flags + php_int_t mysql_flags TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, connect); @@ -888,7 +888,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, net->data->ssl = FALSE; } } else { - unsigned int max_allowed_size = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE; + php_uint_t max_allowed_size = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE; conn->m->set_client_option(conn, MYSQLND_OPT_MAX_ALLOWED_PACKET, (char *)&max_allowed_size TSRMLS_CC); } @@ -1080,11 +1080,11 @@ err: static enum_func_status MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn_handle, const char * host, const char * user, - const char * passwd, unsigned int passwd_len, - const char * db, unsigned int db_len, - unsigned int port, + const char * passwd, php_size_t passwd_len, + const char * db, php_size_t db_len, + php_uint_t port, const char * socket_or_pipe, - unsigned int mysql_flags + php_uint_t mysql_flags TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, connect); @@ -1107,11 +1107,11 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn_handle, /* {{{ mysqlnd_connect */ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn_handle, const char * host, const char * user, - const char * passwd, unsigned int passwd_len, - const char * db, unsigned int db_len, - unsigned int port, + const char * passwd, php_size_t passwd_len, + const char * db, php_size_t db_len, + php_uint_t port, const char * socket_or_pipe, - unsigned int mysql_flags + php_uint_t mysql_flags TSRMLS_DC) { enum_func_status ret = FAIL; @@ -1151,7 +1151,7 @@ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn_handle, Still the result from the query is PASS */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, query)(MYSQLND_CONN_DATA * conn, const char * query, php_size_t query_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, query); enum_func_status ret = FAIL; @@ -1176,7 +1176,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, query)(MYSQLND_CONN_DATA * conn, const char * /* {{{ mysqlnd_conn_data::send_query */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, php_size_t query_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, send_query); enum_func_status ret = FAIL; @@ -1267,7 +1267,7 @@ static int mysqlnd_stream_array_to_fd_set(MYSQLND ** conn_array, fd_set * fds, p { php_socket_t this_fd; php_stream *stream = NULL; - unsigned int cnt = 0; + php_uint_t cnt = 0; MYSQLND **p = conn_array; DBG_ENTER("mysqlnd_stream_array_to_fd_set"); @@ -1536,7 +1536,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, list_method)(MYSQLND_CONN_DATA * conn, const c /* {{{ mysqlnd_conn_data::errno */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, errno)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->error_info->error_no; @@ -1640,7 +1640,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, dump_debug_info)(MYSQLND_CONN_DATA * const con /* {{{ mysqlnd_conn_data::select_db */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, unsigned int db_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, php_size_t db_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, select_db); enum_func_status ret = FAIL; @@ -1702,7 +1702,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, ping)(MYSQLND_CONN_DATA * const conn TSRMLS_DC /* {{{ mysqlnd_conn_data::statistic */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **message, unsigned int * message_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **message, php_size_t * message_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, get_server_statistics); enum_func_status ret = FAIL; @@ -1741,7 +1741,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **me /* {{{ mysqlnd_conn_data::kill */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, kill)(MYSQLND_CONN_DATA * conn, unsigned int pid TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, kill)(MYSQLND_CONN_DATA * conn, php_uint_t pid TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, kill_connection); enum_func_status ret = FAIL; @@ -1973,7 +1973,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, set_state)(MYSQLND_CONN_DATA * const c /* {{{ mysqlnd_conn_data::field_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, field_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->field_count; @@ -1982,7 +1982,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, field_count)(const MYSQLND_CONN_DATA * const c /* {{{ mysqlnd_conn_data::server_status */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, server_status)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->upsert_status->server_status; @@ -2009,7 +2009,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, affected_rows)(const MYSQLND_CONN_DATA * const /* {{{ mysqlnd_conn_data::warning_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, warning_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->upsert_status->warning_count; @@ -2034,7 +2034,7 @@ PHPAPI const char * mysqlnd_get_client_info() /* {{{ mysqlnd_get_client_version */ -PHPAPI unsigned int mysqlnd_get_client_version() +PHPAPI php_uint_t mysqlnd_get_client_version() { return MYSQLND_VERSION_ID; } @@ -2060,7 +2060,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_host_info)(const MYSQLND_CONN_DATA * const /* {{{ mysqlnd_conn_data::get_proto_info */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_conn_data, get_proto_info)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC) { return conn->protocol_version; @@ -2612,7 +2612,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_connection_stats)(const MYSQLND_CONN_DATA /* {{{ mysqlnd_conn_data::set_autocommit */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, set_autocommit)(MYSQLND_CONN_DATA * conn, unsigned int mode TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, set_autocommit)(MYSQLND_CONN_DATA * conn, php_uint_t mode TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_autocommit); enum_func_status ret = FAIL; @@ -2648,7 +2648,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_rollback)(MYSQLND_CONN_DATA * conn TSRMLS_D /* {{{ mysqlnd_tx_cor_options_to_string */ static void -MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * str, const unsigned int mode TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * str, const php_int_t mode TSRMLS_DC) { if (mode & TRANS_COR_AND_CHAIN && !(mode & TRANS_COR_AND_NO_CHAIN)) { if (str->len) { @@ -2680,7 +2680,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const MYSQLND_CONN_D /* {{{ mysqlnd_conn_data::tx_commit_ex */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const unsigned int flags, const char * const name TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const php_int_t flags, const char * const name TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_commit_or_rollback); enum_func_status ret = FAIL; @@ -2694,9 +2694,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con { char * commented_name = NULL; - unsigned int commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; + php_size_t commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; char * query; - unsigned int query_len = mnd_sprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), + php_int_t query_len = mnd_sprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); smart_str_free(&tmp_str); @@ -2721,7 +2721,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con /* {{{ mysqlnd_conn_data::tx_begin */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsigned int mode, const char * const name TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const php_uint_t mode, const char * const name TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_begin); enum_func_status ret = FAIL; @@ -2752,9 +2752,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsi { char * commented_name = NULL; - unsigned int commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; + php_size_t commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0; char * query; - unsigned int query_len = mnd_sprintf(&query, 0, "START TRANSACTION%s %s", commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); + php_size_t query_len = mnd_sprintf(&query, 0, "START TRANSACTION%s %s", commented_name? commented_name:"", tmp_str.c? tmp_str.c:""); smart_str_free(&tmp_str); if (!query) { @@ -2787,7 +2787,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_savepoint)(MYSQLND_CONN_DATA * conn, const if (PASS == conn->m->local_tx_start(conn, this_func TSRMLS_CC)) { do { char * query; - unsigned int query_len; + php_size_t query_len; if (!name) { SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "Savepoint name not provided"); break; @@ -2819,7 +2819,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_savepoint_release)(MYSQLND_CONN_DATA * conn if (PASS == conn->m->local_tx_start(conn, this_func TSRMLS_CC)) { do { char * query; - unsigned int query_len; + php_size_t query_len; if (!name) { SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "Savepoint name not provided"); break; diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index c138cf1..f8c5961 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -66,9 +66,9 @@ PHPAPI void mysqlnd_library_init(TSRMLS_D); PHPAPI void mysqlnd_library_end(TSRMLS_D); -PHPAPI unsigned int mysqlnd_plugin_register(); -PHPAPI unsigned int mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC); -PHPAPI unsigned int mysqlnd_plugin_count(); +PHPAPI php_uint_t mysqlnd_plugin_register(); +PHPAPI php_uint_t mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC); +PHPAPI php_uint_t mysqlnd_plugin_count(); PHPAPI void * _mysqlnd_plugin_find(const char * const name TSRMLS_DC); #define mysqlnd_plugin_find(name) _mysqlnd_plugin_find((name) TSRMLS_CC); @@ -89,11 +89,11 @@ PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_name(const char * const char PHPAPI MYSQLND * _mysqlnd_init(zend_bool persistent TSRMLS_DC); PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn, const char * host, const char * user, - const char * passwd, unsigned int passwd_len, - const char * db, unsigned int db_len, - unsigned int port, + const char * passwd, php_size_t passwd_len, + const char * db, php_size_t db_len, + php_uint_t port, const char * socket_or_pipe, - unsigned int mysql_flags + php_uint_t mysql_flags TSRMLS_DC); #define mysqlnd_change_user(conn, user, passwd, db, silent) ((conn)->data)->m->change_user((conn)->data, (user), (passwd), (db), (silent), strlen((passwd)) TSRMLS_CC) @@ -161,7 +161,7 @@ PHPAPI php_uint_t * _mysqlnd_fetch_lengths(MYSQLND_RES * const result TSRMLS_DC /* mysqlnd metadata */ PHPAPI const char * mysqlnd_get_client_info(); -PHPAPI unsigned int mysqlnd_get_client_version(); +PHPAPI php_uint_t mysqlnd_get_client_version(); #define mysqlnd_ssl_set(conn, key, cert, ca, capath, cipher) ((conn)->data)->m->ssl_set((conn)->data, (key), (cert), (ca), (capath), (cipher) TSRMLS_CC) diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c index 7f9ba76..b1fcdd4 100644 --- a/ext/mysqlnd/mysqlnd_alloc.c +++ b/ext/mysqlnd/mysqlnd_alloc.c @@ -157,7 +157,7 @@ void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D) /* {{{ _mysqlnd_ecalloc */ -void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +void * _mysqlnd_ecalloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { void *ret; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); @@ -198,7 +198,7 @@ void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) /* {{{ _mysqlnd_pecalloc */ -void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) +void * _mysqlnd_pecalloc(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) { void *ret; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); @@ -427,7 +427,7 @@ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D) /* {{{ _mysqlnd_calloc */ -void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +void * _mysqlnd_calloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { void *ret; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); @@ -660,7 +660,7 @@ static void * mysqlnd_zend_mm_pemalloc(size_t size, zend_bool persistent MYSQLND /* {{{ mysqlnd_zend_mm_ecalloc */ -static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +static void * mysqlnd_zend_mm_ecalloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { return ecalloc(nmemb, size); } @@ -668,7 +668,7 @@ static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size MYSQLND_ME /* {{{ mysqlnd_zend_mm_pecalloc */ -static void * mysqlnd_zend_mm_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) +static void * mysqlnd_zend_mm_pecalloc(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D) { return pecalloc(nmemb, size, persistent); } @@ -716,7 +716,7 @@ static void * mysqlnd_zend_mm_malloc(size_t size MYSQLND_MEM_D) /* {{{ mysqlnd_zend_mm_calloc */ -static void * mysqlnd_zend_mm_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) +static void * mysqlnd_zend_mm_calloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D) { return calloc(nmemb, size); } diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index eef5988..32a344c 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -33,14 +33,14 @@ struct st_mysqlnd_allocator_methods { void * (*m_emalloc)(size_t size MYSQLND_MEM_D); void * (*m_pemalloc)(size_t size, zend_bool persistent MYSQLND_MEM_D); - void * (*m_ecalloc)(unsigned int nmemb, size_t size MYSQLND_MEM_D); - void * (*m_pecalloc)(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); + void * (*m_ecalloc)(php_uint_t nmemb, size_t size MYSQLND_MEM_D); + void * (*m_pecalloc)(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); void * (*m_erealloc)(void *ptr, size_t new_size MYSQLND_MEM_D); void * (*m_perealloc)(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); void (*m_efree)(void *ptr MYSQLND_MEM_D); void (*m_pefree)(void *ptr, zend_bool persistent MYSQLND_MEM_D); void * (*m_malloc)(size_t size MYSQLND_MEM_D); - void * (*m_calloc)(unsigned int nmemb, size_t size MYSQLND_MEM_D); + void * (*m_calloc)(php_uint_t nmemb, size_t size MYSQLND_MEM_D); void * (*m_realloc)(void *ptr, size_t new_size MYSQLND_MEM_D); void (*m_free)(void *ptr MYSQLND_MEM_D); char * (*m_pestrndup)(const char * const ptr, size_t size, zend_bool persistent MYSQLND_MEM_D); @@ -54,14 +54,14 @@ PHPAPI extern struct st_mysqlnd_allocator_methods mysqlnd_allocator; PHPAPI void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_ecalloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_pecalloc(php_uint_t nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); PHPAPI void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); PHPAPI void _mysqlnd_efree(void *ptr MYSQLND_MEM_D); PHPAPI void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D); PHPAPI void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_calloc(php_uint_t nmemb, size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D); PHPAPI void _mysqlnd_free(void *ptr MYSQLND_MEM_D); PHPAPI char * _mysqlnd_pestrndup(const char * const ptr, size_t size, zend_bool persistent MYSQLND_MEM_D); diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 5c8fcb3..888c71e 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -38,7 +38,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const size_t db_len, const MYSQLND_OPTIONS * const options, php_uint_t mysql_flags, - unsigned int server_charset_no, + php_uint_t server_charset_no, zend_bool use_full_blown_auth_packet, const char * const auth_protocol, const zend_uchar * const auth_plugin_data, @@ -465,7 +465,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_pam_authentication_plugin static void mysqlnd_xor_string(char * dst, const size_t dst_len, const char * xor_str, const size_t xor_str_len) { - unsigned int i; + php_size_t i; for (i = 0; i <= dst_len; ++i) { dst[i] ^= xor_str[i % xor_str_len]; } diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c index 100e807..246aaf0 100644 --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@ -54,7 +54,7 @@ mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC) /* {{{ mysqlnd_mempool_resize_chunk */ static enum_func_status -mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size TSRMLS_DC) +mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, php_size_t size TSRMLS_DC) { DBG_ENTER("mysqlnd_mempool_resize_chunk"); if (chunk->from_pool) { @@ -112,7 +112,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz /* {{{ mysqlnd_mempool_get_chunk */ static -MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool, unsigned int size TSRMLS_DC) +MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool, php_size_t size TSRMLS_DC) { MYSQLND_MEMORY_POOL_CHUNK *chunk = NULL; DBG_ENTER("mysqlnd_mempool_get_chunk"); diff --git a/ext/mysqlnd/mysqlnd_bt.c b/ext/mysqlnd/mysqlnd_bt.c index bfe40c7..6a18757 100644 --- a/ext/mysqlnd/mysqlnd_bt.c +++ b/ext/mysqlnd/mysqlnd_bt.c @@ -32,7 +32,7 @@ #define TRACE_APPEND_STRL(val, vallen) \ { \ - int l = vallen; \ + php_size_t l = vallen; \ *str = (char*)erealloc(*str, *len + l + 1); \ memcpy((*str) + *len, val, l); \ *len += l; \ @@ -53,10 +53,10 @@ static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { char **str; - int *len; + php_size_t *len; str = va_arg(args, char**); - len = va_arg(args, int*); + len = va_arg(args, php_size_t*); /* the trivial way would be to do: * conver_to_string_ex(arg); @@ -69,7 +69,7 @@ mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, zend_ TRACE_APPEND_STR("NULL, "); break; case IS_STRING: { - int l_added; + php_size_t l_added; TRACE_APPEND_CHR('\''); if (Z_STRSIZE_PP(arg) > 15) { TRACE_APPEND_STRL(Z_STRVAL_PP(arg), 15); @@ -150,7 +150,8 @@ static int mysqlnd_build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { char *s_tmp, **str; - int *len, *num; + php_size_t *len; + int *num; php_int_t line; HashTable *ht = Z_ARRVAL_PP(frame); zval **file, **tmp; @@ -158,7 +159,7 @@ mysqlnd_build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, z level = va_arg(args, uint *); str = va_arg(args, char**); - len = va_arg(args, int*); + len = va_arg(args, php_size_t*); num = va_arg(args, int*); if (!*level) { @@ -188,7 +189,7 @@ mysqlnd_build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, z TRACE_APPEND_KEY("function"); TRACE_APPEND_CHR('('); if (zend_hash_find(ht, "args", sizeof("args"), (void**)&tmp) == SUCCESS) { - int last_len = *len; + php_size_t last_len = *len; zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp) TSRMLS_CC, (apply_func_args_t)mysqlnd_build_trace_args, 2, str, len); if (last_len != *len) { *len -= 2; /* remove last ', ' */ diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index 0382410..9ad36f6 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -62,8 +62,8 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self, enum_func_status ret; int i; char * message_line; - unsigned int message_line_len; - unsigned int flags = self->flags; + php_size_t message_line_len; + php_uint_t flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], line_buffer[6], level_buffer[7]; MYSQLND_ZTS(self); @@ -159,9 +159,9 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, int i; enum_func_status ret; char * message_line, *buffer; - unsigned int message_line_len; + php_size_t message_line_len; va_list args; - unsigned int flags = self->flags; + php_uint_t flags = self->flags; char pid_buffer[10], time_buffer[30], file_buffer[200], line_buffer[6], level_buffer[7]; MYSQLND_ZTS(self); @@ -256,7 +256,7 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, static zend_bool MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, - const char * const func_name, unsigned int func_name_len) + const char * const func_name, php_size_t func_name_len) { if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) { return FALSE; @@ -322,7 +322,7 @@ struct st_mysqlnd_dbg_function_profile { /* {{{ mysqlnd_debug::func_leave */ static enum_func_status -MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, uint64_t call_time) +MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, php_uint_t line, const char * const file, uint64_t call_time) { char *func_name; uint64_t * parent_non_own_time_ptr = NULL, * mine_non_own_time_ptr = NULL; @@ -361,7 +361,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin struct st_mysqlnd_dbg_function_profile f_profile_stack = {0}; struct st_mysqlnd_dbg_function_profile * f_profile = NULL; uint64_t own_time = call_time - mine_non_own_time; - uint func_name_len = strlen(func_name); + php_size_t func_name_len = strlen(func_name); self->m->log_va(self, line, file, zend_stack_count(&self->call_stack) - 1, NULL, "<%s (total=%u own=%u in_calls=%u)", func_name, (unsigned int) call_time, (unsigned int) own_time, (unsigned int) mine_non_own_time @@ -516,7 +516,7 @@ enum mysqlnd_debug_parser_state static void MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const mode) { - unsigned int mode_len, i; + php_size_t mode_len, i; enum mysqlnd_debug_parser_state state = PARSER_WAIT_MODIFIER; mode_len = mode? strlen(mode) : 0; @@ -543,7 +543,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const self->flags |= MYSQLND_DEBUG_APPEND; } if (i + 1 < mode_len && mode[i+1] == ',') { - unsigned int j = i + 2; + php_size_t j = i + 2; #ifdef PHP_WIN32 if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' || mode[i+5] == '/')) { j = i + 5; @@ -575,7 +575,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const break; case 'f': /* limit output to these functions */ if (i + 1 < mode_len && mode[i+1] == ',') { - unsigned int j = i + 2; + php_size_t j = i + 2; i++; while (j < mode_len) { if (mode[j] == ':') { @@ -588,7 +588,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const if (mode[j] == ',' || mode[j] == ':') { if (j > i + 2) { char func_name[1024]; - unsigned int func_name_len = MIN(sizeof(func_name) - 1, j - i - 1); + php_size_t func_name_len = MIN(sizeof(func_name) - 1, j - i - 1); memcpy(func_name, mode + i + 1, func_name_len); func_name[func_name_len] = '\0'; @@ -645,7 +645,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const break; case 't': if (mode[i+1] == ',') { - unsigned int j = i + 2; + php_size_t j = i + 2; while (j < mode_len) { if (mode[j] == ':') { break; diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index 9fbbdc4..a494efe 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -35,8 +35,8 @@ struct st_mysqlnd_debug_methods enum_func_status (*log_va)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, unsigned int level, const char * type, const char *format, ...); zend_bool (*func_enter)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, - const char * const func_name, unsigned int func_name_len); - enum_func_status (*func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, uint64_t call_time); + const char * const func_name, php_size_t func_name_len); + enum_func_status (*func_leave)(MYSQLND_DEBUG * self, php_uint_t line, const char * const file, uint64_t call_time); enum_func_status (*close)(MYSQLND_DEBUG * self); enum_func_status (*free_handle)(MYSQLND_DEBUG * self); }; diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c index 94d69a4..51f05dd 100644 --- a/ext/mysqlnd/mysqlnd_loaddata.c +++ b/ext/mysqlnd/mysqlnd_loaddata.c @@ -66,7 +66,7 @@ int mysqlnd_local_infile_init(void ** ptr, char * filename, void ** userdata TSR /* {{{ mysqlnd_local_infile_read */ static -int mysqlnd_local_infile_read(void * ptr, zend_uchar * buf, unsigned int buf_len TSRMLS_DC) +int mysqlnd_local_infile_read(void * ptr, zend_uchar * buf, php_size_t buf_len TSRMLS_DC) { MYSQLND_INFILE_INFO *info = (MYSQLND_INFILE_INFO *)ptr; int count; @@ -87,7 +87,7 @@ int mysqlnd_local_infile_read(void * ptr, zend_uchar * buf, unsigned int buf_len /* {{{ mysqlnd_local_infile_error */ static -int mysqlnd_local_infile_error(void * ptr, char *error_buf, unsigned int error_buf_len TSRMLS_DC) +int mysqlnd_local_infile_error(void * ptr, char *error_buf, php_size_t error_buf_len TSRMLS_DC) { MYSQLND_INFILE_INFO *info = (MYSQLND_INFILE_INFO *)ptr; @@ -160,7 +160,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen zend_uchar *buf = NULL; zend_uchar empty_packet[MYSQLND_HEADER_SIZE]; enum_func_status result = FAIL; - unsigned int buflen = 4096; + php_size_t buflen = 4096; void *info = NULL; int bufsize; size_t ret; diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index b1a628a..c3b8f91 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -45,7 +45,7 @@ static int mysqlnd_set_sock_no_delay(php_stream * stream TSRMLS_DC) { - int socketd = ((php_netstream_data_t*)stream->abstract)->socket; + php_socket_t socketd = ((php_netstream_data_t*)stream->abstract)->socket; int ret = SUCCESS; int flag = 1; int result = setsockopt(socketd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int)); @@ -1030,7 +1030,7 @@ MYSQLND_METHOD(mysqlnd_net, close_stream)(MYSQLND_NET * const net, MYSQLND_STATS static enum_func_status MYSQLND_METHOD(mysqlnd_net, init)(MYSQLND_NET * const net, MYSQLND_STATS * const stats, MYSQLND_ERROR_INFO * const error_info TSRMLS_DC) { - unsigned int buf_size; + php_size_t buf_size; DBG_ENTER("mysqlnd_net::init"); buf_size = MYSQLND_G(net_cmd_buffer_size); /* this is long, cast to unsigned int*/ diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c index 86543a0..41e176a 100644 --- a/ext/mysqlnd/mysqlnd_plugin.c +++ b/ext/mysqlnd/mysqlnd_plugin.c @@ -92,7 +92,7 @@ mysqlnd_example_plugin_register(TSRMLS_D) static HashTable mysqlnd_registered_plugins; -static unsigned int mysqlnd_plugins_counter = 0; +static php_uint_t mysqlnd_plugins_counter = 0; /* {{{ mysqlnd_plugin_subsystem_init */ @@ -128,7 +128,7 @@ mysqlnd_plugin_subsystem_end(TSRMLS_D) /* {{{ mysqlnd_plugin_register */ -PHPAPI unsigned int mysqlnd_plugin_register() +PHPAPI php_uint_t mysqlnd_plugin_register() { TSRMLS_FETCH(); return mysqlnd_plugin_register_ex(NULL TSRMLS_CC); @@ -137,7 +137,7 @@ PHPAPI unsigned int mysqlnd_plugin_register() /* {{{ mysqlnd_plugin_register_ex */ -PHPAPI unsigned int mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC) +PHPAPI php_uint_t mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC) { if (plugin) { if (plugin->plugin_api_version == MYSQLND_PLUGIN_API_VERSION) { @@ -192,7 +192,7 @@ PHPAPI void _mysqlnd_plugin_apply_with_argument(apply_func_arg_t apply_func, voi /* {{{ mysqlnd_plugin_count */ -PHPAPI unsigned int mysqlnd_plugin_count() +PHPAPI php_uint_t mysqlnd_plugin_count() { return mysqlnd_plugins_counter; } diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h index a868aa7..19fc644 100644 --- a/ext/mysqlnd/mysqlnd_priv.h +++ b/ext/mysqlnd/mysqlnd_priv.h @@ -159,11 +159,11 @@ #define CONN_SET_STATE(c, s) (c)->m->set_state((c), (s) TSRMLS_CC) /* PS stuff */ -typedef void (*ps_field_fetch_func)(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC); +typedef void (*ps_field_fetch_func)(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC); struct st_mysqlnd_perm_bind { ps_field_fetch_func func; /* should be signed int */ - int pack_len; + php_size_t pack_len; unsigned int php_type; zend_bool is_possibly_blob; zend_bool can_ret_as_str_in_uni; @@ -190,7 +190,7 @@ enum_func_status mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const cha void _mysqlnd_init_ps_subsystem();/* This one is private, mysqlnd_library_init() will call it */ void _mysqlnd_init_ps_fetch_subsystem(); -void ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row, unsigned int byte_count TSRMLS_DC); +void ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row, php_uint_t byte_count TSRMLS_DC); void mysqlnd_plugin_subsystem_init(TSRMLS_D); void mysqlnd_plugin_subsystem_end(TSRMLS_D); @@ -211,7 +211,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const size_t db_len, const MYSQLND_OPTIONS * const options, php_uint_t mysql_flags, - unsigned int server_charset_no, + php_uint_t server_charset_no, zend_bool use_full_blown_auth_packet, const char * const auth_protocol, const zend_uchar * const auth_plugin_data, diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 7944d47..42338f0 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -40,15 +40,15 @@ const char * const mysqlnd_stmt_not_prepared = "Statement not prepared"; enum_func_status mysqlnd_stmt_execute_generate_request(MYSQLND_STMT * const s, zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC); enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, - unsigned int flags, + php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC); enum_func_status mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, - unsigned int flags, + php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC); static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt TSRMLS_DC); -static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC); +static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, php_uint_t param_no TSRMLS_DC); /* {{{ mysqlnd_stmt::store_result */ @@ -241,7 +241,7 @@ mysqlnd_stmt_skip_metadata(MYSQLND_STMT * s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; /* Follows parameter metadata, we have just to skip it, as libmysql does */ - unsigned int i = 0; + php_uint_t i = 0; enum_func_status ret = FAIL; MYSQLND_PACKET_RES_FIELD * field_packet; @@ -357,7 +357,7 @@ mysqlnd_stmt_prepare_read_eof(MYSQLND_STMT * s TSRMLS_DC) /* {{{ mysqlnd_stmt::prepare */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const query, php_size_t query_len TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; MYSQLND_STMT * s_to_prepare = s; @@ -621,7 +621,7 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC) bind_result(); execute(); <-- here we will leak because we separate without need */ - unsigned int i; + php_uint_t i; for (i = 0; i < stmt->field_count; i++) { if (stmt->result_bind[i].bound == TRUE) { zval_copy_ctor(stmt->result_bind[i].zv); @@ -650,7 +650,7 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC) } if (stmt->param_count) { - unsigned int i, not_bound = 0; + php_uint_t i, not_bound = 0; if (!stmt->param_bind) { SET_STMT_ERROR(stmt, CR_PARAMS_NOT_BOUND, UNKNOWN_SQLSTATE, "No data supplied for parameters in prepared statement"); @@ -709,12 +709,12 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt_fetch_row_buffered */ enum_func_status -mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { MYSQLND_STMT * s = (MYSQLND_STMT *) param; MYSQLND_STMT_DATA * stmt = s? s->data:NULL; MYSQLND_RES_BUFFERED *set = result->stored_data; - unsigned int field_count = result->meta->field_count; + php_uint_t field_count = result->meta->field_count; DBG_ENTER("mysqlnd_stmt_fetch_row_buffered"); *fetched_anything = FALSE; @@ -726,7 +726,7 @@ mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int f { /* The user could have skipped binding - don't crash*/ if (stmt->result_bind) { - unsigned int i; + php_uint_t i; MYSQLND_RES_METADATA * meta = result->meta; zval **current_row = set->data_cursor; @@ -806,7 +806,7 @@ mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int f /* {{{ mysqlnd_stmt_fetch_row_unbuffered */ static enum_func_status -mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { enum_func_status ret; MYSQLND_STMT * s = (MYSQLND_STMT *) param; @@ -840,7 +840,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int result->m.unbuffered_free_last_data() before it. The function returns always true. */ if (PASS == (ret = PACKET_READ(row_packet, result->conn)) && !row_packet->eof) { - unsigned int i, field_count = result->field_count; + php_uint_t i, field_count = result->field_count; if (!row_packet->skip_extraction) { result->m.unbuffered_free_last_data(result TSRMLS_CC); @@ -973,7 +973,7 @@ MYSQLND_METHOD(mysqlnd_stmt, use_result)(MYSQLND_STMT * s TSRMLS_DC) /* {{{ mysqlnd_fetch_row_cursor */ enum_func_status -mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { enum_func_status ret; MYSQLND_STMT * s = (MYSQLND_STMT *) param; @@ -1018,7 +1018,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla memset(stmt->upsert_status, 0, sizeof(*stmt->upsert_status)); if (PASS == (ret = PACKET_READ(row_packet, result->conn)) && !row_packet->eof) { - unsigned int i, field_count = result->field_count; + php_uint_t i, field_count = result->field_count; if (!row_packet->skip_extraction) { result->m.unbuffered_free_last_data(result TSRMLS_CC); @@ -1145,7 +1145,7 @@ MYSQLND_METHOD(mysqlnd_stmt, fetch)(MYSQLND_STMT * const s, zend_bool * const fe Do the binding once she does it. */ if (stmt->result_bind && !stmt->result_zvals_separated_once) { - unsigned int i; + php_uint_t i; /* mysqlnd_stmt_store_result() has been called free the bind variables to prevent leaking of their previous content. @@ -1185,7 +1185,7 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s TSRMLS_DC) if (stmt->stmt_id) { MYSQLND_CONN_DATA * conn = stmt->conn; if (stmt->param_bind) { - unsigned int i; + php_uint_t i; DBG_INF("resetting long data"); /* Reset Long Data */ for (i = 0; i < stmt->param_count; i++) { @@ -1258,7 +1258,7 @@ MYSQLND_METHOD(mysqlnd_stmt, flush)(MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt::send_long_data */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned int param_no, +MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, php_uint_t param_no, const char * const data, php_uint_t length TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1392,7 +1392,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_parameters)(MYSQLND_STMT * const s, MYSQLND_PA SET_EMPTY_ERROR(*stmt->conn->error_info); if (stmt->param_count) { - unsigned int i = 0; + php_uint_t i = 0; if (!param_bind) { SET_STMT_ERROR(stmt, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, "Re-binding (still) not supported"); @@ -1440,7 +1440,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_parameters)(MYSQLND_STMT * const s, MYSQLND_PA /* {{{ mysqlnd_stmt::bind_one_parameter */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigned int param_no, +MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, php_uint_t param_no, zval * const zv, zend_uchar type TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1548,7 +1548,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const s, SET_EMPTY_ERROR(*stmt->conn->error_info); if (stmt->field_count) { - unsigned int i = 0; + php_uint_t i = 0; if (!result_bind) { DBG_ERR("no result bind passed"); @@ -1580,7 +1580,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const s, /* {{{ mysqlnd_stmt::bind_result */ static enum_func_status -MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const s, unsigned int param_no TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const s, php_uint_t param_no TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; DBG_ENTER("mysqlnd_stmt::bind_result"); @@ -1660,7 +1660,7 @@ MYSQLND_METHOD(mysqlnd_stmt, num_rows)(const MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt::warning_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, warning_count)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1670,7 +1670,7 @@ MYSQLND_METHOD(mysqlnd_stmt, warning_count)(const MYSQLND_STMT * const s TSRMLS_ /* {{{ mysqlnd_stmt::server_status */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, server_status)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1680,7 +1680,7 @@ MYSQLND_METHOD(mysqlnd_stmt, server_status)(const MYSQLND_STMT * const s TSRMLS_ /* {{{ mysqlnd_stmt::field_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, field_count)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1690,7 +1690,7 @@ MYSQLND_METHOD(mysqlnd_stmt, field_count)(const MYSQLND_STMT * const s TSRMLS_DC /* {{{ mysqlnd_stmt::param_count */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, param_count)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1700,7 +1700,7 @@ MYSQLND_METHOD(mysqlnd_stmt, param_count)(const MYSQLND_STMT * const s TSRMLS_DC /* {{{ mysqlnd_stmt::errno */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_stmt, errno)(const MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; @@ -1837,7 +1837,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s, break; } case STMT_ATTR_CURSOR_TYPE: { - unsigned int ival = *(unsigned int *) value; + php_uint_t ival = *(php_uint_t *) value; if (ival > (php_uint_t) CURSOR_TYPE_READ_ONLY) { SET_STMT_ERROR(stmt, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Not implemented"); DBG_INF("FAIL"); @@ -1847,7 +1847,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s, break; } case STMT_ATTR_PREFETCH_ROWS: { - unsigned int ival = *(unsigned int *) value; + php_uint_t ival = *(php_uint_t *) value; if (ival == 0) { ival = MYSQLND_DEFAULT_PREFETCH_ROWS; } else if (ival > 1) { @@ -1960,7 +1960,7 @@ static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const s TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; - unsigned int i; + php_uint_t i; DBG_ENTER("mysqlnd_stmt_separate_result_bind"); if (!stmt) { @@ -2013,7 +2013,7 @@ mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const s TSRMLS_DC) /* {{{ mysqlnd_stmt_separate_one_result_bind */ static void -mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const s, unsigned int param_no TSRMLS_DC) +mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const s, php_uint_t param_no TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s? s->data:NULL; DBG_ENTER("mysqlnd_stmt_separate_one_result_bind"); @@ -2074,7 +2074,7 @@ MYSQLND_METHOD(mysqlnd_stmt, free_stmt_content)(MYSQLND_STMT * const s TSRMLS_DC /* Destroy the input bind */ if (stmt->param_bind) { - unsigned int i; + php_uint_t i; /* Because only the bound variables can point to our internal buffers, then separate or free only them. Free is possible because the user could have diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c index cc8ed54..2babd31 100644 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@ -54,8 +54,8 @@ struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST + 1]; /* {{{ ps_fetch_from_1_to_8_bytes */ void -ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, - zend_uchar ** row, unsigned int byte_count TSRMLS_DC) +ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, + zend_uchar ** row, php_uint_t byte_count TSRMLS_DC) { char tmp[22]; size_t tmp_len = 0; @@ -127,7 +127,7 @@ ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigne /* {{{ ps_fetch_null */ static void -ps_fetch_null(zval *zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_null(zval *zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ZVAL_NULL(zv); } @@ -136,7 +136,7 @@ ps_fetch_null(zval *zv, const MYSQLND_FIELD * const field, unsigned int pack_len /* {{{ ps_fetch_int8 */ static void -ps_fetch_int8(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int8(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 1 TSRMLS_CC); } @@ -145,7 +145,7 @@ ps_fetch_int8(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_le /* {{{ ps_fetch_int16 */ static void -ps_fetch_int16(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int16(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 2 TSRMLS_CC); } @@ -154,7 +154,7 @@ ps_fetch_int16(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_int32 */ static void -ps_fetch_int32(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int32(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 4 TSRMLS_CC); } @@ -163,7 +163,7 @@ ps_fetch_int32(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_int64 */ static void -ps_fetch_int64(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_int64(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, 8 TSRMLS_CC); } @@ -172,7 +172,7 @@ ps_fetch_int64(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_float */ static void -ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { float value; DBG_ENTER("ps_fetch_float"); @@ -187,7 +187,7 @@ ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l /* {{{ ps_fetch_double */ static void -ps_fetch_double(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_double(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { double value; DBG_ENTER("ps_fetch_double"); @@ -202,7 +202,7 @@ ps_fetch_double(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_ /* {{{ ps_fetch_time */ static void -ps_fetch_time(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_time(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { struct st_mysqlnd_time t; php_uint_t length; /* First byte encodes the length*/ @@ -245,7 +245,7 @@ ps_fetch_time(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_le /* {{{ ps_fetch_date */ static void -ps_fetch_date(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_date(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { struct st_mysqlnd_time t = {0}; php_uint_t length; /* First byte encodes the length*/ @@ -282,7 +282,7 @@ ps_fetch_date(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_le /* {{{ ps_fetch_datetime */ static void -ps_fetch_datetime(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_datetime(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { struct st_mysqlnd_time t; php_uint_t length; /* First byte encodes the length*/ @@ -326,7 +326,7 @@ ps_fetch_datetime(zval * zv, const MYSQLND_FIELD * const field, unsigned int pac /* {{{ ps_fetch_string */ static void -ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { /* For now just copy, before we make it possible @@ -346,7 +346,7 @@ ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_ /* {{{ ps_fetch_bit */ static void -ps_fetch_bit(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_len, zend_uchar ** row TSRMLS_DC) +ps_fetch_bit(zval * zv, const MYSQLND_FIELD * const field, php_size_t pack_len, zend_uchar ** row TSRMLS_DC) { php_uint_t length = php_mysqlnd_net_field_length(row); ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, length TSRMLS_CC); @@ -499,7 +499,7 @@ void _mysqlnd_init_ps_fetch_subsystem() /* {{{ mysqlnd_stmt_copy_it */ static enum_func_status -mysqlnd_stmt_copy_it(zval *** copies, zval * original, unsigned int param_count, unsigned int current TSRMLS_DC) +mysqlnd_stmt_copy_it(zval *** copies, zval * original, php_uint_t param_count, php_uint_t current TSRMLS_DC) { if (!*copies) { *copies = mnd_ecalloc(param_count, sizeof(zval *)); @@ -521,7 +521,7 @@ static enum_func_status mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar **p, size_t *buf_len TSRMLS_DC) { MYSQLND_STMT_DATA * stmt = s->data; - unsigned int i = 0; + php_uint_t i = 0; zend_uchar * provided_buffer = *buf; size_t left = (*buf_len - (*p - *buf)); size_t data_size = 0; @@ -533,7 +533,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar DBG_ENTER("mysqlnd_stmt_execute_store_params"); { - unsigned int null_count = (stmt->param_count + 7) / 8; + php_uint_t null_count = (stmt->param_count + 7) / 8; /* give it some reserved space - 20 bytes */ if (left < (null_count + 20)) { ptrdiff_t offset = *p - *buf; @@ -675,7 +675,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar /* 2. Store data */ /* 2.1 Calculate how much space we need */ for (i = 0; i < stmt->param_count; i++) { - unsigned int j; + php_uint_t j; zval *the_var = stmt->param_bind[i].zv; if (!the_var || (stmt->param_bind[i].type != MYSQL_TYPE_LONG_BLOB && Z_TYPE_P(the_var) == IS_NULL)) { diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index d5fcb39..90b6761 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -37,10 +37,10 @@ static enum_func_status MYSQLND_METHOD(mysqlnd_res, initialize_result_set_rest)(MYSQLND_RES * const result TSRMLS_DC) { - unsigned int i; + php_uint_t i; zval **data_cursor = result->stored_data? result->stored_data->data:NULL; zval **data_begin = result->stored_data? result->stored_data->data:NULL; - unsigned int field_count = result->meta? result->meta->field_count : 0; + php_uint_t field_count = result->meta? result->meta->field_count : 0; uint64_t row_count = result->stored_data? result->stored_data->row_count:0; enum_func_status ret = PASS; DBG_ENTER("mysqlnd_res::initialize_result_set_rest"); @@ -140,7 +140,7 @@ MYSQLND_METHOD(mysqlnd_res, unbuffered_free_last_data)(MYSQLND_RES * result TSRM } if (unbuf->last_row_data) { - unsigned int i, ctor_called_count = 0; + php_uint_t i, ctor_called_count = 0; zend_bool copy_ctor_called; MYSQLND_STATS *global_stats = result->conn? result->conn->stats:NULL; @@ -178,15 +178,15 @@ static void MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC) { MYSQLND_RES_BUFFERED *set = result->stored_data; - unsigned int field_count = result->field_count; + php_uint_t field_count = result->field_count; int64_t row; DBG_ENTER("mysqlnd_res::free_buffered_data"); DBG_INF_FMT("Freeing "MYSQLND_LLU_SPEC" row(s)", set->row_count); if (set->data) { - unsigned int copy_on_write_performed = 0; - unsigned int copy_on_write_saved = 0; + php_uint_t copy_on_write_performed = 0; + php_uint_t copy_on_write_saved = 0; for (row = set->row_count - 1; row >= 0; row--) { zval **current_row = set->data + row * field_count; @@ -510,7 +510,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s stmt->state = MYSQLND_STMT_INITTED; } } else { - unsigned int to_log = MYSQLND_G(log_mask); + php_uint_t to_log = MYSQLND_G(log_mask); to_log &= fields_eof->server_status; DBG_INF_FMT("warnings=%u server_status=%u", fields_eof->warning_count, fields_eof->server_status); conn->upsert_status->warning_count = fields_eof->warning_count; @@ -561,7 +561,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s static php_uint_t * mysqlnd_fetch_lengths_buffered(MYSQLND_RES * const result TSRMLS_DC) { - unsigned int i; + php_uint_t i; zval **previous_row; MYSQLND_RES_BUFFERED *set = result->stored_data; @@ -612,7 +612,7 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES * result TSRMLS_DC) { enum_func_status ret; MYSQLND_ROW_C retrow = NULL; - unsigned int i, + php_uint_t i, field_count = result->field_count; MYSQLND_PACKET_ROW *row_packet = result->row_packet; php_uint_t *lengths = result->lengths; @@ -669,7 +669,7 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES * result TSRMLS_DC) if (retrow) { for (i = 0; i < field_count; i++, field++, hash_key++) { zval *data = result->unbuf->last_row_data[i]; - unsigned int len; + php_size_t len; if (Z_TYPE_P(data) != IS_NULL) { convert_to_string(data); @@ -725,7 +725,7 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES * result TSRMLS_DC) /* {{{ mysqlnd_fetch_row_unbuffered */ static enum_func_status -mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { enum_func_status ret; zval *row = (zval *) param; @@ -767,7 +767,7 @@ mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, unsigned int fla HashTable *row_ht = Z_ARRVAL_P(row); MYSQLND_FIELD *field = result->meta->fields; struct mysqlnd_field_hash_key * hash_key = result->meta->zend_hash_keys; - unsigned int i, field_count = result->field_count; + php_uint_t i, field_count = result->field_count; php_uint_t *lengths = result->lengths; enum_func_status rc = result->m.row_decoder(result->unbuf->last_row_buffer, @@ -781,7 +781,7 @@ mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, unsigned int fla } for (i = 0; i < field_count; i++, field++, hash_key++) { zval *data = result->unbuf->last_row_data[i]; - unsigned int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRSIZE_P(data); + php_size_t len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRSIZE_P(data); if (lengths) { lengths[i] = len; @@ -924,7 +924,7 @@ mysqlnd_fetch_row_buffered_c(MYSQLND_RES * result TSRMLS_DC) zval **current_row = set->data_cursor; MYSQLND_FIELD *field = result->meta->fields; struct mysqlnd_field_hash_key * hash_key = result->meta->zend_hash_keys; - unsigned int i; + php_uint_t i; if (NULL == current_row[0]) { uint64_t row_num = (set->data_cursor - set->data) / result->meta->field_count; @@ -981,9 +981,9 @@ mysqlnd_fetch_row_buffered_c(MYSQLND_RES * result TSRMLS_DC) /* {{{ mysqlnd_fetch_row_buffered */ static enum_func_status -mysqlnd_fetch_row_buffered(MYSQLND_RES * result, void *param, unsigned int flags, zend_bool *fetched_anything TSRMLS_DC) +mysqlnd_fetch_row_buffered(MYSQLND_RES * result, void *param, php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC) { - unsigned int i; + php_uint_t i; zval *row = (zval *) param; MYSQLND_RES_BUFFERED *set = result->stored_data; enum_func_status ret = FAIL; @@ -1080,7 +1080,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c { enum_func_status ret; MYSQLND_PACKET_ROW *row_packet = NULL; - unsigned int next_extend = STORE_RESULT_PREALLOCATED_SET_IF_NOT_EMPTY, free_rows = 1; + php_uint_t next_extend = STORE_RESULT_PREALLOCATED_SET_IF_NOT_EMPTY, free_rows = 1; MYSQLND_RES_BUFFERED *set; DBG_ENTER("mysqlnd_res::store_result_fetch_data"); @@ -1344,7 +1344,7 @@ MYSQLND_METHOD(mysqlnd_res, num_rows)(const MYSQLND_RES * const result TSRMLS_DC /* {{{ mysqlnd_res::num_fields */ -static unsigned int +static php_uint_t MYSQLND_METHOD(mysqlnd_res, num_fields)(const MYSQLND_RES * const result TSRMLS_DC) { return result->field_count; @@ -1464,7 +1464,7 @@ MYSQLND_METHOD(mysqlnd_res, field_tell)(const MYSQLND_RES * const result TSRMLS_ /* {{{ mysqlnd_res::fetch_into */ static void -MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, unsigned int flags, +MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, php_uint_t flags, zval *return_value, enum_mysqlnd_extension extension TSRMLS_DC ZEND_FILE_LINE_DC) { @@ -1529,7 +1529,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_row_c)(MYSQLND_RES * result TSRMLS_DC) /* {{{ mysqlnd_res::fetch_all */ static void -MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) +MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, php_uint_t flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) { zval *row; php_uint_t i = 0; @@ -1547,7 +1547,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, unsigned int flags, } /* 4 is a magic value. The cast is safe, if larger then the array will be later extended - no big deal :) */ - mysqlnd_array_init(return_value, set? (unsigned int) set->row_count : 4); + mysqlnd_array_init(return_value, set? (php_uint_t) set->row_count : 4); do { MAKE_STD_ZVAL(row); @@ -1566,11 +1566,11 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, unsigned int flags, /* {{{ mysqlnd_res::fetch_field_data */ static void -MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, unsigned int offset, zval *return_value TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, php_uint_t offset, zval *return_value TSRMLS_DC) { zval row; zval **entry; - unsigned int i = 0; + php_uint_t i = 0; DBG_ENTER("mysqlnd_res::fetch_field_data"); DBG_INF_FMT("offset=%u", offset); @@ -1646,7 +1646,7 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_result_init */ PHPAPI MYSQLND_RES * -mysqlnd_result_init(unsigned int field_count, zend_bool persistent TSRMLS_DC) +mysqlnd_result_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC) { size_t alloc_size = sizeof(MYSQLND_RES) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_RES *ret = mnd_pecalloc(1, alloc_size, persistent); diff --git a/ext/mysqlnd/mysqlnd_result.h b/ext/mysqlnd/mysqlnd_result.h index 54f3b03..c647c02 100644 --- a/ext/mysqlnd/mysqlnd_result.h +++ b/ext/mysqlnd/mysqlnd_result.h @@ -23,7 +23,7 @@ #ifndef MYSQLND_RESULT_H #define MYSQLND_RESULT_H -PHPAPI MYSQLND_RES * mysqlnd_result_init(unsigned int field_count, zend_bool persistent TSRMLS_DC); +PHPAPI MYSQLND_RES * mysqlnd_result_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC); enum_func_status mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * stmt TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index e7b32c4..dbe670d 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@ -96,7 +96,7 @@ mysqlnd_is_key_numeric(const char * key, size_t length, php_int_t *idx) static enum_func_status MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const meta, MYSQLND_CONN_DATA * conn TSRMLS_DC) { - unsigned int i = 0; + php_uint_t i = 0; MYSQLND_PACKET_RES_FIELD * field_packet; DBG_ENTER("mysqlnd_res_meta::read_metadata"); @@ -202,7 +202,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met static void MYSQLND_METHOD(mysqlnd_res_meta, free)(MYSQLND_RES_METADATA * meta TSRMLS_DC) { - int i; + php_uint_t i; MYSQLND_FIELD *fields; DBG_ENTER("mysqlnd_res_meta::free"); DBG_INF_FMT("persistent=%u", meta->persistent); @@ -234,7 +234,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, free)(MYSQLND_RES_METADATA * meta TSRMLS_DC) static MYSQLND_RES_METADATA * MYSQLND_METHOD(mysqlnd_res_meta, clone_metadata)(const MYSQLND_RES_METADATA * const meta, zend_bool persistent TSRMLS_DC) { - unsigned int i; + php_uint_t i; /* +1 is to have empty marker at the end */ MYSQLND_RES_METADATA * new_meta = NULL; MYSQLND_FIELD * new_fields; @@ -386,7 +386,7 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_result_meta_init */ PHPAPI MYSQLND_RES_METADATA * -mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_DC) +mysqlnd_result_meta_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC) { size_t alloc_size = sizeof(MYSQLND_RES_METADATA) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_RES_METADATA *ret = mnd_pecalloc(1, alloc_size, persistent); diff --git a/ext/mysqlnd/mysqlnd_result_meta.h b/ext/mysqlnd/mysqlnd_result_meta.h index 97720ad..40d7c5b 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.h +++ b/ext/mysqlnd/mysqlnd_result_meta.h @@ -23,7 +23,7 @@ #ifndef MYSQLND_RESULT_META_H #define MYSQLND_RESULT_META_H -PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_DC); +PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(php_uint_t field_count, zend_bool persistent TSRMLS_DC); PHPAPI struct st_mysqlnd_res_meta_methods * mysqlnd_result_metadata_get_methods(); PHPAPI void ** _mysqlnd_plugin_get_plugin_result_metadata_data(const MYSQLND_RES_METADATA * meta, unsigned int plugin_id TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index ce19327..b19baa8 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -199,7 +199,7 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) { - unsigned int i; + php_uint_t i; mysqlnd_array_init(return_value, stats->count); for (i = 0; i < stats->count; i++) { diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 2928cc0..51f9516 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -44,11 +44,11 @@ typedef struct st_mysqlnd_memory_pool_chunk_llist MYSQLND_MEMORY_POOL_CHUNK_LLIS struct st_mysqlnd_memory_pool { zend_uchar *arena; - unsigned int refcount; - unsigned int arena_size; - unsigned int free_size; + php_uint_t refcount; + php_size_t arena_size; + php_size_t free_size; - MYSQLND_MEMORY_POOL_CHUNK* (*get_chunk)(MYSQLND_MEMORY_POOL * pool, unsigned int size TSRMLS_DC); + MYSQLND_MEMORY_POOL_CHUNK* (*get_chunk)(MYSQLND_MEMORY_POOL * pool, php_size_t size TSRMLS_DC); }; struct st_mysqlnd_memory_pool_chunk @@ -56,8 +56,8 @@ struct st_mysqlnd_memory_pool_chunk size_t app; MYSQLND_MEMORY_POOL *pool; zend_uchar *ptr; - unsigned int size; - enum_func_status (*resize_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size TSRMLS_DC); + php_size_t size; + enum_func_status (*resize_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk, php_size_t size TSRMLS_DC); void (*free_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC); zend_bool from_pool; }; @@ -81,16 +81,16 @@ typedef struct st_mysqlnd_field char *def; /* Default value (set by mysql_list_fields) */ php_uint_t length; /* Width of column (create length) */ php_uint_t max_length; /* Max width for selected set */ - unsigned int name_length; - unsigned int org_name_length; - unsigned int table_length; - unsigned int org_table_length; - unsigned int db_length; - unsigned int catalog_length; - unsigned int def_length; - unsigned int flags; /* Diverse flags */ - unsigned int decimals; /* Number of decimals in field */ - unsigned int charsetnr; /* Character set */ + php_size_t name_length; + php_size_t org_name_length; + php_size_t table_length; + php_size_t org_table_length; + php_size_t db_length; + php_size_t catalog_length; + php_size_t def_length; + php_int_t flags; /* Diverse flags */ + php_int_t decimals; /* Number of decimals in field */ + php_int_t charsetnr; /* Character set */ enum mysqlnd_field_types type; /* Type of field. See mysql_com.h for types */ char *root; size_t root_len; @@ -99,8 +99,8 @@ typedef struct st_mysqlnd_field typedef struct st_mysqlnd_upsert_result { - unsigned int warning_count; - unsigned int server_status; + php_uint_t warning_count; + php_uint_t server_status; uint64_t affected_rows; uint64_t last_insert_id; } MYSQLND_UPSERT_STATUS; @@ -110,7 +110,7 @@ typedef struct st_mysqlnd_error_info { char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; zend_llist * error_list; } MYSQLND_ERROR_INFO; @@ -119,7 +119,7 @@ typedef struct st_mysqlnd_error_list_element { char * error; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; } MYSQLND_ERROR_LIST_ELEMENT; @@ -135,11 +135,11 @@ typedef struct st_mysqlnd_infile_info /* character set information */ typedef struct st_mysqlnd_charset { - unsigned int nr; + php_uint_t nr; const char *name; const char *collation; - unsigned int char_minlen; - unsigned int char_maxlen; + php_size_t char_minlen; + php_size_t char_maxlen; const char *comment; unsigned int (*mb_charlen)(unsigned int c); unsigned int (*mb_valid)(const char *start, const char *end); @@ -150,8 +150,8 @@ typedef struct st_mysqlnd_charset typedef struct st_mysqlnd_infile { int (*local_infile_init)(void **ptr, char *filename, void **userdata TSRMLS_DC); - int (*local_infile_read)(void *ptr, zend_uchar * buf, unsigned int buf_len TSRMLS_DC); - int (*local_infile_error)(void *ptr, char *error_msg, unsigned int error_msg_len TSRMLS_DC); + int (*local_infile_read)(void *ptr, zend_uchar * buf, php_size_t buf_len TSRMLS_DC); + int (*local_infile_error)(void *ptr, char *error_msg, php_size_t error_msg_len TSRMLS_DC); void (*local_infile_end)(void *ptr TSRMLS_DC); zval *callback; void *userdata; @@ -162,7 +162,7 @@ typedef struct st_mysqlnd_options ulong flags; /* init commands - we need to send them to server directly after connect */ - unsigned int num_commands; + php_uint_t num_commands; char **init_commands; /* configuration file information */ @@ -194,9 +194,9 @@ typedef struct st_mysqlnd_options typedef struct st_mysqlnd_net_options { /* timeouts */ - unsigned int timeout_connect; - unsigned int timeout_read; - unsigned int timeout_write; + php_uint_t timeout_connect; + php_uint_t timeout_read; + php_uint_t timeout_write; size_t net_read_buffer_size; @@ -228,7 +228,7 @@ typedef struct st_mysqlnd_res MYSQLND_RES; typedef char** MYSQLND_ROW_C; /* return data as array of strings */ typedef struct st_mysqlnd_stmt_data MYSQLND_STMT_DATA; typedef struct st_mysqlnd_stmt MYSQLND_STMT; -typedef unsigned int MYSQLND_FIELD_OFFSET; +typedef php_uint_t MYSQLND_FIELD_OFFSET; typedef struct st_mysqlnd_param_bind MYSQLND_PARAM_BIND; @@ -244,7 +244,7 @@ typedef struct st_mysqlnd_debug MYSQLND_DEBUG; typedef MYSQLND_RES* (*mysqlnd_stmt_use_or_store_func)(MYSQLND_STMT * const TSRMLS_DC); typedef enum_func_status (*mysqlnd_fetch_row_func)(MYSQLND_RES *result, void *param, - unsigned int flags, + php_uint_t flags, zend_bool *fetched_anything TSRMLS_DC); @@ -411,11 +411,11 @@ struct st_mysqlnd_object_factory_methods typedef enum_func_status (*func_mysqlnd_conn_data__init)(MYSQLND_CONN_DATA * conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__connect)(MYSQLND_CONN_DATA * conn, const char * host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__connect)(MYSQLND_CONN_DATA * conn, const char * host, const char * user, const char * passwd, php_size_t passwd_len, const char * db, php_size_t db_len, php_uint_t port, const char * socket_or_pipe, php_int_t mysql_flags TSRMLS_DC); typedef php_uint_t (*func_mysqlnd_conn_data__escape_string)(MYSQLND_CONN_DATA * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__set_charset)(MYSQLND_CONN_DATA * const conn, const char * const charset TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__send_query)(MYSQLND_CONN_DATA * conn, const char *query, unsigned int query_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__query)(MYSQLND_CONN_DATA * conn, const char * query, php_size_t query_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__send_query)(MYSQLND_CONN_DATA * conn, const char *query, php_size_t query_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__reap_query)(MYSQLND_CONN_DATA * conn TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_conn_data__use_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_conn_data__store_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); @@ -428,12 +428,12 @@ typedef enum_func_status (*func_mysqlnd_conn_data__shutdown_server)(MYSQLND_CONN typedef enum_func_status (*func_mysqlnd_conn_data__refresh_server)(MYSQLND_CONN_DATA * const conn, uint8_t options TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__ping)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__kill_connection)(MYSQLND_CONN_DATA * conn, unsigned int pid TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, unsigned int db_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__kill_connection)(MYSQLND_CONN_DATA * conn, php_uint_t pid TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, php_size_t db_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__server_dump_debug_information)(MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__change_user)(MYSQLND_CONN_DATA * const conn, const char * user, const char * passwd, const char * db, zend_bool silent, size_t passwd_len TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_error_no)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_error_no)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_error_str)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_sqlstate)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef uint64_t (*func_mysqlnd_conn_data__get_thread_id)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); @@ -441,9 +441,9 @@ typedef void (*func_mysqlnd_conn_data__get_statistics)(const MYSQLND_CONN_DAT typedef php_uint_t (*func_mysqlnd_conn_data__get_server_version)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_server_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__get_server_statistics)(MYSQLND_CONN_DATA * conn, char **message, unsigned int * message_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__get_server_statistics)(MYSQLND_CONN_DATA * conn, char **message, php_size_t * message_len TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_host_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_protocol_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_protocol_information)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__get_last_message)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef const char * (*func_mysqlnd_conn_data__charset_name)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_conn_data__list_fields)(MYSQLND_CONN_DATA * conn, const char * table, const char * achtung_wild TSRMLS_DC); @@ -451,11 +451,11 @@ typedef MYSQLND_RES * (*func_mysqlnd_conn_data__list_method)(MYSQLND_CONN_DATA typedef uint64_t (*func_mysqlnd_conn_data__get_last_insert_id)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef uint64_t (*func_mysqlnd_conn_data__get_affected_rows)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_warning_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_warning_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_field_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_field_count)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_server_status)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_conn_data__get_server_status)(const MYSQLND_CONN_DATA * const conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__set_server_option)(MYSQLND_CONN_DATA * const conn, enum_mysqlnd_server_option option TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__set_client_option)(MYSQLND_CONN_DATA * const conn, enum_mysqlnd_option option, const char * const value TSRMLS_DC); typedef void (*func_mysqlnd_conn_data__free_contents)(MYSQLND_CONN_DATA * conn TSRMLS_DC);/* private */ @@ -478,22 +478,22 @@ typedef enum_func_status (*func_mysqlnd_conn_data__send_close)(MYSQLND_CONN_DATA typedef enum_func_status (*func_mysqlnd_conn_data__ssl_set)(MYSQLND_CONN_DATA * const conn, const char * key, const char * const cert, const char * const ca, const char * const capath, const char * const cipher TSRMLS_DC); -typedef MYSQLND_RES * (*func_mysqlnd_conn_data__result_init)(unsigned int field_count, zend_bool persistent TSRMLS_DC); +typedef MYSQLND_RES * (*func_mysqlnd_conn_data__result_init)(php_uint_t field_count, zend_bool persistent TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__set_autocommit)(MYSQLND_CONN_DATA * conn, unsigned int mode TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__set_autocommit)(MYSQLND_CONN_DATA * conn, php_uint_t mode TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit)(MYSQLND_CONN_DATA * conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_rollback)(MYSQLND_CONN_DATA * conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__tx_begin)(MYSQLND_CONN_DATA * conn, const unsigned int mode, const char * const name TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const unsigned int flags, const char * const name TSRMLS_DC); -typedef void (*func_mysqlnd_conn_data__tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * tmp_str, const unsigned int mode TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__tx_begin)(MYSQLND_CONN_DATA * conn, const php_uint_t mode, const char * const name TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const php_int_t flags, const char * const name TSRMLS_DC); +typedef void (*func_mysqlnd_conn_data__tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const conn, smart_str * tmp_str, const php_int_t mode TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_savepoint)(MYSQLND_CONN_DATA * conn, const char * const name TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__tx_savepoint_release)(MYSQLND_CONN_DATA * conn, const char * const name TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__local_tx_start)(MYSQLND_CONN_DATA * conn, size_t this_func TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__local_tx_end)(MYSQLND_CONN_DATA * conn, size_t this_func, enum_func_status status TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__execute_init_commands)(MYSQLND_CONN_DATA * conn TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_conn_data__get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, unsigned int mysql_flags TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn_data__connect_handshake)(MYSQLND_CONN_DATA * conn, const char * const host, const char * const user, const char * const passwd, const unsigned int passwd_len, const char * const db, const unsigned int db_len, const unsigned int mysql_flags TSRMLS_DC); +typedef php_int_t (*func_mysqlnd_conn_data__get_updated_connect_flags)(MYSQLND_CONN_DATA * conn, php_int_t mysql_flags TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn_data__connect_handshake)(MYSQLND_CONN_DATA * conn, const char * const host, const char * const user, const char * const passwd, const php_size_t passwd_len, const char * const db, const php_size_t db_len, const php_int_t mysql_flags TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__simple_command_send_request)(MYSQLND_CONN_DATA * conn, enum php_mysqlnd_server_command command, const zend_uchar * const arg, size_t arg_len, zend_bool silent, zend_bool ignore_upsert_status TSRMLS_DC); typedef struct st_mysqlnd_authentication_plugin * (*func_mysqlnd_conn_data__fetch_auth_plugin_by_name)(const char * const requested_protocol TSRMLS_DC); @@ -593,7 +593,7 @@ struct st_mysqlnd_conn_data_methods }; -typedef enum_func_status (*func_mysqlnd_data__connect)(MYSQLND * conn, const char * host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_data__connect)(MYSQLND * conn, const char * host, const char * user, const char * passwd, php_size_t passwd_len, const char * db, php_size_t db_len, php_uint_t port, const char * socket_or_pipe, php_uint_t mysql_flags TSRMLS_DC); typedef MYSQLND * (*func_mysqlnd_conn__clone_object)(MYSQLND * const conn TSRMLS_DC); typedef void (*func_mysqlnd_conn__dtor)(MYSQLND * conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn__close)(MYSQLND * conn, enum_connection_close_type close_type TSRMLS_DC); @@ -613,12 +613,12 @@ typedef mysqlnd_fetch_row_func fetch_row_normal_unbuffered; /* private */ typedef MYSQLND_RES * (*func_mysqlnd_res__use_result)(MYSQLND_RES * const result, zend_bool ps_protocol TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_res__store_result)(MYSQLND_RES * result, MYSQLND_CONN_DATA * const conn, zend_bool ps TSRMLS_DC); -typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, unsigned int flags, zval *return_value, enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC); +typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, php_uint_t flags, zval *return_value, enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC); typedef MYSQLND_ROW_C (*func_mysqlnd_res__fetch_row_c)(MYSQLND_RES *result TSRMLS_DC); -typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); -typedef void (*func_mysqlnd_res__fetch_field_data)(MYSQLND_RES *result, unsigned int offset, zval *return_value TSRMLS_DC); +typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, php_uint_t flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); +typedef void (*func_mysqlnd_res__fetch_field_data)(MYSQLND_RES *result, php_uint_t offset, zval *return_value TSRMLS_DC); typedef uint64_t (*func_mysqlnd_res__num_rows)(const MYSQLND_RES * const result TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_res__skip_result)(MYSQLND_RES * const result TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_res__seek_data)(MYSQLND_RES * result, uint64_t row TSRMLS_DC); typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__seek_field)(MYSQLND_RES * const result, MYSQLND_FIELD_OFFSET field_offset TSRMLS_DC); @@ -641,10 +641,10 @@ typedef void (*func_mysqlnd_res__unbuffered_free_last_data)(MYSQLND_RES *resu /* for decoding - binary or text protocol */ typedef enum_func_status (*func_mysqlnd_res__row_decoder)(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC); -typedef MYSQLND_RES_METADATA * (*func_mysqlnd_res__result_meta_init)(unsigned int field_count, zend_bool persistent TSRMLS_DC); +typedef MYSQLND_RES_METADATA * (*func_mysqlnd_res__result_meta_init)(php_uint_t field_count, zend_bool persistent TSRMLS_DC); struct st_mysqlnd_res_methods { @@ -711,7 +711,7 @@ struct st_mysqlnd_res_meta_methods }; -typedef enum_func_status (*func_mysqlnd_stmt__prepare)(MYSQLND_STMT * const stmt, const char * const query, unsigned int query_len TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__prepare)(MYSQLND_STMT * const stmt, const char * const query, php_size_t query_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__execute)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__use_result)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__store_result)(MYSQLND_STMT * const stmt TSRMLS_DC); @@ -725,20 +725,20 @@ typedef enum_func_status (*func_mysqlnd_stmt__net_close)(MYSQLND_STMT * const st typedef enum_func_status (*func_mysqlnd_stmt__dtor)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /* use this for mysqlnd_stmt_close */ typedef enum_func_status (*func_mysqlnd_stmt__fetch)(MYSQLND_STMT * const stmt, zend_bool * const fetched_anything TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__bind_parameters)(MYSQLND_STMT * const stmt, MYSQLND_PARAM_BIND * const param_bind TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_stmt__bind_one_parameter)(MYSQLND_STMT * const stmt, unsigned int param_no, zval * const zv, zend_uchar type TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__bind_one_parameter)(MYSQLND_STMT * const stmt, php_uint_t param_no, zval * const zv, zend_uchar type TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__refresh_bind_param)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__bind_result)(MYSQLND_STMT * const stmt, MYSQLND_RESULT_BIND * const result_bind TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_stmt__bind_one_result)(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_stmt__send_long_data)(MYSQLND_STMT * const stmt, unsigned int param_num, const char * const data, php_uint_t length TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__bind_one_result)(MYSQLND_STMT * const stmt, php_uint_t param_no TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_stmt__send_long_data)(MYSQLND_STMT * const stmt, php_uint_t param_num, const char * const data, php_uint_t length TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__get_parameter_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef MYSQLND_RES * (*func_mysqlnd_stmt__get_result_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef uint64_t (*func_mysqlnd_stmt__get_last_insert_id)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef uint64_t (*func_mysqlnd_stmt__get_affected_rows)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef uint64_t (*func_mysqlnd_stmt__get_num_rows)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_param_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_field_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_warning_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__get_error_no)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_param_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_field_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_warning_count)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__get_error_no)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef const char * (*func_mysqlnd_stmt__get_error_str)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef const char * (*func_mysqlnd_stmt__get_sqlstate)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__get_attribute)(const MYSQLND_STMT * const stmt, enum mysqlnd_stmt_attr attr_type, void * const value TSRMLS_DC); @@ -747,7 +747,7 @@ typedef MYSQLND_PARAM_BIND *(*func_mysqlnd_stmt__alloc_param_bind)(MYSQLND_STMT typedef MYSQLND_RESULT_BIND*(*func_mysqlnd_stmt__alloc_result_bind)(MYSQLND_STMT * const stmt TSRMLS_DC); typedef void (*func_mysqlnd_stmt__free_parameter_bind)(MYSQLND_STMT * const stmt, MYSQLND_PARAM_BIND * TSRMLS_DC); typedef void (*func_mysqlnd_stmt__free_result_bind)(MYSQLND_STMT * const stmt, MYSQLND_RESULT_BIND * TSRMLS_DC); -typedef unsigned int (*func_mysqlnd_stmt__server_status)(const MYSQLND_STMT * const stmt TSRMLS_DC); +typedef php_uint_t (*func_mysqlnd_stmt__server_status)(const MYSQLND_STMT * const stmt TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__generate_execute_request)(MYSQLND_STMT * const s, zend_uchar ** request, size_t *request_len, zend_bool * free_buffer TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_stmt__parse_execute_response)(MYSQLND_STMT * const s TSRMLS_DC); typedef void (*func_mysqlnd_stmt__free_stmt_content)(MYSQLND_STMT * const s TSRMLS_DC); @@ -822,7 +822,7 @@ struct st_mysqlnd_net_data #endif MYSQLND_NET_OPTIONS options; - unsigned int refcount; + php_uint_t refcount; zend_bool persistent; @@ -866,15 +866,15 @@ struct st_mysqlnd_connection_data /* Information related */ char *host; - unsigned int host_len; + php_size_t host_len; char *unix_socket; - unsigned int unix_socket_len; + php_size_t unix_socket_len; char *user; - unsigned int user_len; + php_size_t user_len; char *passwd; - unsigned int passwd_len; + php_size_t passwd_len; char *scheme; - unsigned int scheme_len; + php_size_t scheme_len; uint64_t thread_id; char *server_version; char *host_info; @@ -883,11 +883,11 @@ struct st_mysqlnd_connection_data const MYSQLND_CHARSET *charset; const MYSQLND_CHARSET *greet_charset; char *connect_or_select_db; - unsigned int connect_or_select_db_len; + php_size_t connect_or_select_db_len; MYSQLND_INFILE infile; - unsigned int protocol_version; + php_uint_t protocol_version; php_uint_t max_packet_size; - unsigned int port; + php_uint_t port; php_uint_t client_flag; php_uint_t server_capabilities; @@ -895,7 +895,7 @@ struct st_mysqlnd_connection_data MYSQLND_UPSERT_STATUS * upsert_status; MYSQLND_UPSERT_STATUS upsert_status_impl; char *last_message; - unsigned int last_message_len; + php_size_t last_message_len; /* If error packet, we use these */ MYSQLND_ERROR_INFO * error_info; @@ -917,10 +917,10 @@ struct st_mysqlnd_connection_data The result set objects can determine by inspecting 'quit_sent' whether the connection is still valid. */ - unsigned int refcount; + php_uint_t refcount; /* Temporal storage for mysql_query */ - unsigned int field_count; + php_uint_t field_count; /* persistent connection */ zend_bool persistent; @@ -955,10 +955,10 @@ struct st_mysqlnd_result_metadata { MYSQLND_FIELD *fields; struct mysqlnd_field_hash_key *zend_hash_keys; - unsigned int current_field; - unsigned int field_count; + php_uint_t current_field; + php_uint_t field_count; /* We need this to make fast allocs in rowp_read */ - unsigned int bit_fields_count; + php_uint_t bit_fields_count; size_t bit_fields_total_len; /* trailing \0 not counted */ zend_bool persistent; @@ -974,7 +974,7 @@ struct st_mysqlnd_buffered_result uint64_t row_count; uint64_t initialized_rows; - unsigned int references; + php_uint_t references; MYSQLND_ERROR_INFO error_info; }; @@ -995,7 +995,7 @@ struct st_mysqlnd_res { MYSQLND_CONN_DATA *conn; enum_mysqlnd_res_type type; - unsigned int field_count; + php_uint_t field_count; /* For metadata functions */ MYSQLND_RES_METADATA *meta; @@ -1039,10 +1039,10 @@ struct st_mysqlnd_stmt_data php_uint_t stmt_id; php_uint_t flags;/* cursor is set here */ enum_mysqlnd_stmt_state state; - unsigned int warning_count; + php_uint_t warning_count; MYSQLND_RES *result; - unsigned int field_count; - unsigned int param_count; + php_uint_t field_count; + php_uint_t param_count; unsigned char send_types_to_server; MYSQLND_PARAM_BIND *param_bind; MYSQLND_RESULT_BIND *result_bind; @@ -1062,7 +1062,7 @@ struct st_mysqlnd_stmt_data mysqlnd_stmt_use_or_store_func default_rset_handler; MYSQLND_CMD_BUFFER execute_cmd_buffer; - unsigned int execute_count;/* count how many times the stmt was executed */ + php_uint_t execute_count;/* count how many times the stmt was executed */ }; @@ -1083,7 +1083,7 @@ typedef struct st_mysqlnd_string struct st_mysqlnd_plugin_header { - unsigned int plugin_api_version; + php_uint_t plugin_api_version; const char * plugin_name; php_uint_t plugin_version; const char * plugin_string_version; @@ -1112,7 +1112,7 @@ struct st_mysqlnd_typeii_plugin_example { struct st_mysqlnd_plugin_header plugin_header; void * methods; - unsigned int counter; + php_uint_t counter; }; struct st_mysqlnd_authentication_plugin; diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 52ab703..2e0b51c 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -232,12 +232,12 @@ php_mysqlnd_net_store_length_size(uint64_t length) /* {{{ php_mysqlnd_read_error_from_line */ static enum_func_status -php_mysqlnd_read_error_from_line(zend_uchar *buf, size_t buf_len, - char *error, int error_buf_len, - unsigned int *error_no, char *sqlstate TSRMLS_DC) +php_mysqlnd_read_error_from_line(zend_uchar *buf, php_size_t buf_len, + char *error, php_size_t error_buf_len, + php_uint_t *error_no, char *sqlstate TSRMLS_DC) { zend_uchar *p = buf; - int error_msg_len= 0; + php_size_t error_msg_len= 0; DBG_ENTER("php_mysqlnd_read_error_from_line"); @@ -970,7 +970,7 @@ size_t php_mysqlnd_cmd_write(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) /* Let's have some space, which we can use, if not enough, we will allocate new buffer */ MYSQLND_PACKET_COMMAND * packet= (MYSQLND_PACKET_COMMAND *) _packet; MYSQLND_NET * net = conn->net; - unsigned int error_reporting = EG(error_reporting); + php_uint_t error_reporting = EG(error_reporting); size_t sent = 0; DBG_ENTER("php_mysqlnd_cmd_write"); @@ -1193,7 +1193,7 @@ php_mysqlnd_rset_field_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) char *root_ptr; php_uint_t len; MYSQLND_FIELD *meta; - unsigned int i, field_count = sizeof(rset_field_offsets)/sizeof(size_t); + php_uint_t i, field_count = sizeof(rset_field_offsets)/sizeof(size_t); DBG_ENTER("php_mysqlnd_rset_field_read"); @@ -1477,10 +1477,10 @@ php_mysqlnd_read_row_ex(MYSQLND_CONN_DATA * conn, MYSQLND_MEMORY_POOL * result_s /* {{{ php_mysqlnd_rowp_read_binary_protocol */ enum_func_status php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC) { - unsigned int i; + php_uint_t i; zend_uchar * p = row_buffer->ptr; zend_uchar * null_ptr, bit; zval **current_field, **end_field, **start_field; @@ -1575,10 +1575,10 @@ php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zv /* {{{ php_mysqlnd_rowp_read_text_protocol */ enum_func_status php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC) { - unsigned int i; + php_uint_t i; zend_bool last_field_was_string = FALSE; zval **current_field, **end_field, **start_field; zend_uchar * p = row_buffer->ptr; @@ -1931,7 +1931,7 @@ php_mysqlnd_prepare_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) zend_uchar *buf = (zend_uchar *) conn->net->cmd_buffer.buffer; zend_uchar *p = buf; zend_uchar *begin = buf; - unsigned int data_size; + php_size_t data_size; MYSQLND_PACKET_PREPARE_RESPONSE *packet= (MYSQLND_PACKET_PREPARE_RESPONSE *) _packet; DBG_ENTER("php_mysqlnd_prepare_read"); diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 2e74230..1c9c418 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -82,7 +82,7 @@ typedef struct st_mysqlnd_packet_greet { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; char *auth_protocol; } MYSQLND_PACKET_GREET; @@ -119,7 +119,7 @@ typedef struct st_mysqlnd_packet_auth_response { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; char *new_auth_protocol; size_t new_auth_protocol_len; @@ -149,7 +149,7 @@ typedef struct st_mysqlnd_packet_ok { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; } MYSQLND_PACKET_OK; @@ -171,7 +171,7 @@ typedef struct st_mysqlnd_packet_eof { /* If error packet, we use these */ char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; - unsigned int error_no; + php_uint_t error_no; } MYSQLND_PACKET_EOF; /* EOF packet */ @@ -236,7 +236,7 @@ typedef struct st_mysqlnd_packet_row { zend_bool persistent_alloc; MYSQLND_FIELD *fields_metadata; /* We need this to alloc bigger bufs in non-PS mode */ - unsigned int bit_fields_count; + php_uint_t bit_fields_count; size_t bit_fields_total_len; /* trailing \0 not counted */ /* If error packet, we use these */ @@ -259,9 +259,9 @@ typedef struct st_mysqlnd_packet_prepare_response { /* also known as field_count 0x00=OK , 0xFF=error */ unsigned char error_code; php_uint_t stmt_id; - unsigned int field_count; - unsigned int param_count; - unsigned int warning_count; + php_uint_t field_count; + php_uint_t param_count; + php_uint_t warning_count; /* present in case of error */ MYSQLND_ERROR_INFO error_info; @@ -307,12 +307,12 @@ PHPAPI const extern char * const mysqlnd_empty_string; enum_func_status php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC); enum_func_status php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, - unsigned int field_count, const MYSQLND_FIELD * fields_metadata, + php_uint_t field_count, const MYSQLND_FIELD * fields_metadata, zend_bool as_int_or_float, MYSQLND_STATS * stats TSRMLS_DC); diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 48f3533..d590ecc 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -547,7 +547,7 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, php_int_t colno, in { struct pdo_column_data *col; char *value = NULL; - php_uint_t value_len = 0; + php_size_t value_len = 0; int caller_frees = 0; int type, new_type; @@ -880,7 +880,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, } if (return_value) { - int i = 0; + php_int_t i = 0; if (how == PDO_FETCH_LAZY) { get_lazy_object(stmt, return_value TSRMLS_CC); diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index 8be4612..bdba281 100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -566,7 +566,7 @@ struct _pdo_stmt_t { * the statement has been executed at least once. In some cases, might * not be valid until fetch (at the driver level) has been called at least once. * */ - int column_count; + php_uint_t column_count; struct pdo_column_data *columns; /* we want to keep the dbh alive while we live, so we own a reference */ diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 75b8619..2cb95bd 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -43,7 +43,7 @@ #endif /* {{{ _pdo_mysql_error */ -int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC) +php_uint_t _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC) { pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data; pdo_error_type *pdo_err; @@ -436,7 +436,7 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, php_int_t attr, zval *return_ case PDO_ATTR_SERVER_INFO: { char *tmp; #if defined(PDO_USE_MYSQLND) - unsigned int tmp_len; + php_size_t tmp_len; if (mysqlnd_stat(H->server, &tmp, &tmp_len) == PASS) { ZVAL_STRINGL(return_value, tmp, tmp_len, 0); diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 477218d..6617826 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -92,7 +92,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql) typedef struct { const char *file; int line; - unsigned int errcode; + php_uint_t errcode; char *errmsg; } pdo_mysql_error_info; @@ -132,7 +132,7 @@ typedef struct { #else MYSQL_STMT *stmt; #endif - int num_params; + php_uint_t num_params; PDO_MYSQL_PARAM_BIND *params; #ifndef PDO_USE_MYSQLND my_bool *in_null; @@ -142,12 +142,12 @@ typedef struct { my_bool *out_null; php_uint_t *out_length; unsigned int params_given; - unsigned max_length:1; + php_size_t max_length:1; } pdo_mysql_stmt; extern pdo_driver_t pdo_mysql_driver; -extern int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC); +extern php_uint_t _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC); #define pdo_mysql_error(s) _pdo_mysql_error(s, NULL, __FILE__, __LINE__ TSRMLS_CC) #define pdo_mysql_error_stmt(s) _pdo_mysql_error(stmt->dbh, stmt, __FILE__, __LINE__ TSRMLS_CC)