[prev in list] [next in list] [prev in thread] [next in thread]
List: php-cvs
Subject: [PHP-CVS] com php-src: more fixes for ext/mysqli: =?UTF-8?Q?ext/mysqli/mysqli=5Fapi?= =?UTF-8?Q?=2Ec
From: Anatol Belski <ab () php ! net>
Date: 2013-11-30 20:51:21
Message-ID: php-mail-1994f765107ef67ef7d5e28bb0f4391f1632939218 () git ! php ! net
[Download RAW message or body]
Commit: eb922c6c9c604b5712e397dee4de89de47047a9b
Author: Anatol Belski <ab@php.net> Sat, 30 Nov 2013 21:51:21 +0100
Parents: d76d415f555dfea436c0cec72f3cdf3f01be691e
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb922c6c9c604b5712e397dee4de89de47047a9b
Log:
more fixes for ext/mysqli
Changed paths:
M ext/mysqli/mysqli_api.c
M ext/mysqli/mysqli_nonapi.c
M ext/mysqli/mysqli_prop.c
["diff_eb922c6c9c604b5712e397dee4de89de47047a9b.txt" (text/plain)]
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 8bca572..0722c78 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -287,7 +287,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval ***args, \
unsigned int argc, int i, ofs;
int var_cnt = argc - start;
long col_type;
- ulong rc;
+ php_uint_t rc;
/* prevent leak if variables are already bound */
if (stmt->result.var_cnt) {
@@ -385,7 +385,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval ***args, \
unsigned int argc, /* Changed to my_bool in MySQL 5.1. See MySQL Bug #16144 */
my_bool tmp;
#else
- ulong tmp = 0;
+ php_uint_t tmp = 0;
#endif
stmt->result.buf[ofs].type = IS_STRING;
/*
@@ -476,7 +476,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result)
zval ***args;
int argc = ZEND_NUM_ARGS();
int start = 1;
- ulong rc;
+ php_uint_t rc;
MY_STMT *stmt;
zval *mysql_stmt;
@@ -933,7 +933,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
MY_STMT *stmt;
zval *mysql_stmt;
unsigned int i;
- ulong ret;
+ php_uint_t ret;
unsigned int uval;
my_ulonglong llval;
@@ -1217,7 +1217,7 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", \
MYSQLI_STATUS_VALID);
- if (offset < 0 || offset >= (long) mysql_num_fields(result)) {
+ if (offset < 0 || offset >= (php_int_t) mysql_num_fields(result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field offset is invalid for \
resultset"); RETURN_FALSE;
}
@@ -1355,7 +1355,7 @@ PHP_FUNCTION(mysqli_get_client_info)
Get MySQL client info */
PHP_FUNCTION(mysqli_get_client_version)
{
- RETURN_LONG((long)mysql_get_client_version());
+ RETURN_LONG((php_int_t)mysql_get_client_version());
}
/* }}} */
@@ -2584,7 +2584,7 @@ PHP_FUNCTION(mysqli_thread_id)
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
- RETURN_LONG((long) mysql_thread_id(mysql->mysql));
+ RETURN_LONG((php_int_t) mysql_thread_id(mysql->mysql));
}
/* }}} */
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 2cf885e..26a7276 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -42,7 +42,7 @@
/* {{{ php_mysqli_set_error
*/
-static void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC)
+static void php_mysqli_set_error(php_int_t mysql_errno, char *mysql_err TSRMLS_DC)
{
MyG(error_no) = mysql_errno;
if (MyG(error_msg)) {
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index bd9cee2..2bd185f 100644
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -84,8 +84,8 @@ static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
ZVAL_NULL(*retval);\
} else {\
l = (__ret_type)__int_func(p);\
- if (l < LONG_MAX) {\
- ZVAL_LONG(*retval, (long) l);\
+ if (l < PHP_INT_MAX) {\
+ ZVAL_LONG(*retval, (php_int_t) l);\
} else { \
char *ret; \
int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \
@@ -136,7 +136,7 @@ static int link_client_info_read(mysqli_object *obj, zval \
**retval TSRMLS_DC) static int link_connect_errno_read(mysqli_object *obj, zval \
**retval TSRMLS_DC) {
MAKE_STD_ZVAL(*retval);
- ZVAL_LONG(*retval, (long)MyG(error_no));
+ ZVAL_LONG(*retval, (php_int_t)MyG(error_no));
return SUCCESS;
}
/* }}} */
@@ -178,8 +178,8 @@ static int link_affected_rows_read(mysqli_object *obj, zval \
**retval TSRMLS_DC) return SUCCESS;
}
- if (rc < LONG_MAX) {
- ZVAL_LONG(*retval, (long) rc);
+ if (rc < PHP_INT_MAX) {
+ ZVAL_LONG(*retval, (php_int_t) rc);
} else {
char *ret;
int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);
@@ -239,18 +239,18 @@ static int link_error_list_read(mysqli_object *obj, zval \
**retval TSRMLS_DC)
/* link properties */
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), ulong, "%lu") \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), php_uint_t, ZEND_UINT_FMT) \
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_error_read, mysql_error, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED))
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu") \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_host_info_read, mysql_get_host_info, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID)) \
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_info_read, mysql_info, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID)) \
MYSQLI_MAP_PROPERTY_FUNC_LONG(link_insert_id_read, mysql_insert_id, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC)
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read, mysql_get_proto_info, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu") \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read, mysql_get_proto_info, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_server_info_read, mysql_get_server_info, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID))
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read, mysql_get_server_version, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu") \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read, mysql_get_server_version, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_sqlstate_read, mysql_sqlstate, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID))
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu")
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu") \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, \
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT)
/* {{{ property link_stat_read */
static int link_stat_read(mysqli_object *obj, zval **retval TSRMLS_DC)
@@ -310,7 +310,7 @@ static int result_type_read(mysqli_object *obj, zval **retval \
TSRMLS_DC) static int result_lengths_read(mysqli_object *obj, zval **retval \
TSRMLS_DC) {
MYSQL_RES *p;
- ulong *ret;
+ php_uint_t *ret;
MAKE_STD_ZVAL(*retval);
@@ -319,7 +319,7 @@ static int result_lengths_read(mysqli_object *obj, zval **retval \
TSRMLS_DC) if (!p || !p->field_count || !(ret = mysql_fetch_lengths(p))) {
ZVAL_NULL(*retval);
} else {
- ulong i;
+ php_uint_t i;
array_init(*retval);
@@ -332,8 +332,8 @@ static int result_lengths_read(mysqli_object *obj, zval **retval \
TSRMLS_DC) /* }}} */
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell, \
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%lu")
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields, \
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%lu") \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell, \
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields, \
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows, \
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC)
/* statement properties */
@@ -378,8 +378,8 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval \
**retval TSRMLS_DC) return SUCCESS;
}
- if (rc < LONG_MAX) {
- ZVAL_LONG(*retval, (long) rc);
+ if (rc < PHP_INT_MAX) {
+ ZVAL_LONG(*retval, (php_int_t) rc);
} else {
char *ret;
int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);
@@ -437,9 +437,9 @@ static int stmt_error_list_read(mysqli_object *obj, zval **retval \
TSRMLS_DC)
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id, \
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC) \
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows, \
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC)
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count, \
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%lu")
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count, \
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%lu")
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno, \
MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED), ulong, "%lu") \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count, \
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count, \
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), php_uint_t, ZEND_UINT_FMT) \
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno, \
MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED), php_uint_t, ZEND_UINT_FMT) \
MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_error_read, mysql_stmt_error, \
MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED)) \
MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_sqlstate_read, mysql_stmt_sqlstate, \
MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED))
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic