[prev in list] [next in list] [prev in thread] [next in thread]
List: php-cvs
Subject: [PHP-CVS] com php-src: started to fix ext/mysqli: ext/mysqli/mysqli.c =?UTF-8?Q?ext/mysqli/mysqli=5F
From: Anatol Belski <ab () php ! net>
Date: 2013-11-30 14:58:57
Message-ID: php-mail-4f8b60ddfb817752fa31fa11c7b6a008292993225 () git ! php ! net
[Download RAW message or body]
Commit: f3703d86f74da1904011d9e5f99632ba0dceeb46
Author: Anatol Belski <ab@php.net> Sat, 30 Nov 2013 15:58:57 +0100
Parents: ef216c21fdcf8e29499c84bba5b987aca62385f0
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f3703d86f74da1904011d9e5f99632ba0dceeb46
Log:
started to fix ext/mysqli
Changed paths:
M ext/mysqli/mysqli.c
M ext/mysqli/mysqli_api.c
M ext/mysqli/mysqli_embedded.c
M ext/mysqli/mysqli_nonapi.c
M ext/mysqli/mysqli_priv.h
M ext/mysqli/mysqli_report.c
M ext/mysqli/mysqli_warning.c
M ext/mysqli/php_mysqli_structs.h
["diff_f3703d86f74da1904011d9e5f99632ba0dceeb46.txt" (text/plain)]
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index ad4e25c..be28559 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -334,7 +334,7 @@ zval *mysqli_read_property(zval *object, zval *member, int type, \
const zend_lite }
if (obj->prop_handler != NULL) {
- ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, \
(void **) &hnd); + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), \
Z_STRSIZE_P(member)+1, (void **) &hnd); }
if (ret == SUCCESS) {
@@ -376,7 +376,7 @@ void mysqli_write_property(zval *object, zval *member, zval \
*value, const zend_l obj = (mysqli_object *)zend_objects_get_address(object \
TSRMLS_CC);
if (obj->prop_handler != NULL) {
- ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), \
Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find((HashTable \
*)obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); }
if (ret == SUCCESS) {
hnd->write_func(obj, value TSRMLS_CC);
@@ -413,7 +413,7 @@ static int mysqli_object_has_property(zval *object, zval *member, \
int has_set_ex mysqli_prop_handler p;
int ret = 0;
- if (zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, \
(void **)&p) == SUCCESS) { + if (zend_hash_find(obj->prop_handler, \
Z_STRVAL_P(member), Z_STRSIZE_P(member) + 1, (void **)&p) == SUCCESS) { switch \
(has_set_exists) { case 2:
ret = 1;
@@ -1034,7 +1034,7 @@ PHP_FUNCTION(mysqli_stmt_construct)
MY_STMT *stmt;
MYSQLI_RESOURCE *mysqli_resource;
char *statement;
- int statement_len;
+ zend_str_size_int statement_len;
switch (ZEND_NUM_ARGS())
{
@@ -1049,7 +1049,7 @@ PHP_FUNCTION(mysqli_stmt_construct)
stmt->stmt = mysql_stmt_init(mysql->mysql);
break;
case 2:
- if (zend_parse_parameters(2 TSRMLS_CC, "Os", &mysql_link, \
mysqli_link_class_entry, &statement, &statement_len)==FAILURE) { + if \
(zend_parse_parameters(2 TSRMLS_CC, "OS", &mysql_link, mysqli_link_class_entry, \
&statement, &statement_len)==FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1089,7 +1089,7 @@ PHP_FUNCTION(mysqli_result_construct)
MYSQL_RES *result = NULL;
zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource;
- long resmode = MYSQLI_STORE_RESULT;
+ php_int_t resmode = MYSQLI_STORE_RESULT;
switch (ZEND_NUM_ARGS()) {
case 1:
@@ -1098,7 +1098,7 @@ PHP_FUNCTION(mysqli_result_construct)
}
break;
case 2:
- if (zend_parse_parameters(2 TSRMLS_CC, "Ol", &mysql_link, \
mysqli_link_class_entry, &resmode)==FAILURE) { + if (zend_parse_parameters(2 \
TSRMLS_CC, "Oi", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) { return;
}
break;
@@ -1135,13 +1135,13 @@ PHP_FUNCTION(mysqli_result_construct)
/* {{{ php_mysqli_fetch_into_hash_aux
*/
-void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long \
fetchtype TSRMLS_DC) +void php_mysqli_fetch_into_hash_aux(zval *return_value, \
MYSQL_RES * result, php_int_t fetchtype TSRMLS_DC) {
#if !defined(MYSQLI_USE_MYSQLND)
MYSQL_ROW row;
unsigned int i;
MYSQL_FIELD *fields;
- unsigned long *field_len;
+ php_uint_t *field_len;
if (!(row = mysql_fetch_row(result))) {
RETURN_NULL();
@@ -1188,7 +1188,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, \
MYSQL_RES * result, long /* check if we need magic quotes */
if (PG(magic_quotes_runtime)) {
Z_TYPE_P(res) = IS_STRING;
- Z_STRVAL_P(res) = php_addslashes(row[i], field_len[i], &Z_STRLEN_P(res), 0 \
TSRMLS_CC); + Z_STRVAL_P(res) = php_addslashes(row[i], field_len[i], \
&Z_STRSIZE_P(res), 0 TSRMLS_CC); } else {
#endif
ZVAL_STRINGL(res, row[i], field_len[i], 1);
@@ -1228,15 +1228,15 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, \
int override_flags {
MYSQL_RES *result;
zval *mysql_result;
- long fetchtype;
+ php_int_t fetchtype;
zval *ctor_params = NULL;
zend_class_entry *ce = NULL;
if (into_object) {
char *class_name;
- int class_name_len;
+ zend_str_size_int class_name_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|sz", \
&mysql_result, mysqli_result_class_entry, &class_name, &class_name_len, &ctor_params) \
== FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, \
getThis(), "O|Sz", &mysql_result, mysqli_result_class_entry, &class_name, \
&class_name_len, &ctor_params) == FAILURE) { return;
}
if (ZEND_NUM_ARGS() < (getThis() ? 1 : 2)) {
@@ -1257,7 +1257,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, \
int override_flags fetchtype = override_flags;
} else {
fetchtype = MYSQLI_BOTH;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", \
&mysql_result, mysqli_result_class_entry, &fetchtype) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", \
&mysql_result, mysqli_result_class_entry, &fetchtype) == FAILURE) { return;
}
}
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index e67aba8..8bca572 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -107,9 +107,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int \
argc, unsigned in break;
case 'i': /* Integer */
-#if SIZEOF_LONG==8
+#if SIZEOF_ZEND_INT==8
bind[ofs].buffer_type = MYSQL_TYPE_LONGLONG;
-#elif SIZEOF_LONG==4
+#elif SIZEOF_ZEND_INT==4
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
#endif
bind[ofs].buffer = &Z_LVAL_PP(args[i]);
@@ -179,9 +179,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int \
argc, unsigned in type = MYSQL_TYPE_DOUBLE;
break;
case 'i': /* Integer */
-#if SIZEOF_LONG==8
+#if SIZEOF_ZEND_INT==8
type = MYSQL_TYPE_LONGLONG;
-#elif SIZEOF_LONG==4
+#elif SIZEOF_ZEND_INT==4
type = MYSQL_TYPE_LONG;
#endif
break;
@@ -220,8 +220,8 @@ PHP_FUNCTION(mysqli_stmt_bind_param)
MY_STMT *stmt;
zval *mysql_stmt;
char *types;
- int types_len;
- unsigned long rc;
+ zend_str_size_int types_len;
+ php_uint_t rc;
/* calculate and check number of parameters */
if (argc < 2) {
@@ -229,7 +229,7 @@ PHP_FUNCTION(mysqli_stmt_bind_param)
WRONG_PARAM_COUNT;
}
- if (zend_parse_method_parameters((getThis()) ? 1:2 TSRMLS_CC, getThis(), "Os", \
&mysql_stmt, mysqli_stmt_class_entry, + if (zend_parse_method_parameters((getThis()) \
? 1:2 TSRMLS_CC, getThis(), "OS", &mysql_stmt, mysqli_stmt_class_entry, &types, \
&types_len) == FAILURE) { return;
}
@@ -521,13 +521,13 @@ PHP_FUNCTION(mysqli_change_user)
MY_MYSQL *mysql;
zval *mysql_link = NULL;
char *user, *password, *dbname;
- int user_len, password_len, dbname_len;
- ulong rc;
+ zend_str_size_int user_len, password_len, dbname_len;
+ php_uint_t rc;
#if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET)
const CHARSET_INFO * old_charset;
#endif
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osss", \
&mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, \
&dbname, &dbname_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSSS", \
&mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, \
&dbname, &dbname_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -702,11 +702,11 @@ PHP_FUNCTION(mysqli_commit)
{
MY_MYSQL *mysql;
zval *mysql_link;
- long flags = TRANS_COR_NO_OPT;
+ php_int_t flags = TRANS_COR_NO_OPT;
char * name = NULL;
- int name_len = 0;
+ zend_str_size_int name_len = 0;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", \
&mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|iS", \
&mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { \
return; }
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -728,9 +728,9 @@ PHP_FUNCTION(mysqli_data_seek)
{
MYSQL_RES *result;
zval *mysql_result;
- long offset;
+ php_int_t offset;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", \
&mysql_result, mysqli_result_class_entry, &offset) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", \
&mysql_result, mysqli_result_class_entry, &offset) == FAILURE) { return;
}
@@ -755,9 +755,9 @@ PHP_FUNCTION(mysqli_data_seek)
PHP_FUNCTION(mysqli_debug)
{
char *debug;
- int debug_len;
+ zend_str_size_int debug_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &debug, &debug_len) == \
FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &debug, \
&debug_len) == FAILURE) { return;
}
@@ -874,7 +874,7 @@ PHP_FUNCTION(mysqli_stmt_execute)
}
convert_to_string_ex(&the_var);
stmt->stmt->params[i].buffer = Z_STRVAL_P(the_var);
- stmt->stmt->params[i].buffer_length = Z_STRLEN_P(the_var);
+ stmt->stmt->params[i].buffer_length = Z_STRSIZE_P(the_var);
break;
case MYSQL_TYPE_DOUBLE:
if (the_var == stmt->param.vars[i] && Z_TYPE_P(stmt->param.vars[i]) != \
IS_DOUBLE) { @@ -973,7 +973,7 @@ void \
mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) {
/* unsigned int (11) */
uval= *(unsigned int *) stmt->result.buf[i].val;
-#if SIZEOF_LONG==4
+#if SIZEOF_ZEND_INT==4
if (uval > INT_MAX) {
char *tmp, *p;
int j=10;
@@ -1023,9 +1023,9 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
{
llval= *(my_ulonglong *) stmt->result.buf[i].val;
}
-#if SIZEOF_LONG==8
+#if SIZEOF_ZEND_INT==8
if (uns && llval > 9223372036854775807L) {
-#elif SIZEOF_LONG==4
+#elif SIZEOF_ZEND_INT==4
if ((uns && llval > L64(2147483647)) ||
(!uns && (( L64(2147483647) < (my_longlong) llval) ||
(L64(-2147483648) > (my_longlong) llval))))
@@ -1209,9 +1209,9 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
MYSQL_RES *result;
zval *mysql_result;
const MYSQL_FIELD *field;
- long offset;
+ php_int_t offset;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", \
&mysql_result, mysqli_result_class_entry, &offset) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", \
&mysql_result, mysqli_result_class_entry, &offset) == FAILURE) { return;
}
@@ -1238,7 +1238,7 @@ PHP_FUNCTION(mysqli_fetch_lengths)
MYSQL_RES *result;
zval *mysql_result;
unsigned int i;
- unsigned long *ret;
+ php_uint_t *ret;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", \
&mysql_result, mysqli_result_class_entry) == FAILURE) { return;
@@ -1290,9 +1290,9 @@ PHP_FUNCTION(mysqli_field_seek)
{
MYSQL_RES *result;
zval *mysql_result;
- unsigned long fieldnr;
+ php_uint_t fieldnr;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", \
&mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", \
&mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", \
MYSQLI_STATUS_VALID); @@ -1520,9 +1520,9 @@ PHP_FUNCTION(mysqli_kill)
{
MY_MYSQL *mysql;
zval *mysql_link;
- long processid;
+ php_int_t processid;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", \
&mysql_link, mysqli_link_class_entry, &processid) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", \
&mysql_link, mysqli_link_class_entry, &processid) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1733,12 +1733,12 @@ PHP_FUNCTION(mysqli_options)
MY_MYSQL *mysql;
zval *mysql_link = NULL;
zval **mysql_value;
- long mysql_option;
+ php_int_t mysql_option;
unsigned int l_value;
- long ret;
+ php_int_t ret;
int expected_type;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OlZ", \
&mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OiZ", \
&mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) { \
return; }
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_INITIALIZED);
@@ -1789,7 +1789,7 @@ PHP_FUNCTION(mysqli_ping)
{
MY_MYSQL *mysql;
zval *mysql_link;
- long rc;
+ php_int_t rc;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", \
&mysql_link, mysqli_link_class_entry) == FAILURE) { return;
@@ -1809,11 +1809,11 @@ PHP_FUNCTION(mysqli_prepare)
MY_MYSQL *mysql;
MY_STMT *stmt;
char *query = NULL;
- int query_len;
+ zend_str_size_int query_len;
zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \
"Os",&mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS",&mysql_link, \
mysqli_link_class_entry, &query, &query_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1896,9 +1896,9 @@ PHP_FUNCTION(mysqli_real_query)
MY_MYSQL *mysql;
zval *mysql_link;
char *query = NULL;
- int query_len;
+ zend_str_size_int query_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1926,9 +1926,9 @@ PHP_FUNCTION(mysqli_real_escape_string) {
MY_MYSQL *mysql;
zval *mysql_link = NULL;
char *escapestr, *newstr;
- int escapestr_len, newstr_len;
+ zend_str_size_int escapestr_len, newstr_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_link, mysqli_link_class_entry, &escapestr, &escapestr_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_link, mysqli_link_class_entry, &escapestr, &escapestr_len) == FAILURE) { \
return; }
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1948,11 +1948,11 @@ PHP_FUNCTION(mysqli_rollback)
{
MY_MYSQL *mysql;
zval *mysql_link;
- long flags = TRANS_COR_NO_OPT;
+ php_int_t flags = TRANS_COR_NO_OPT;
char * name = NULL;
- int name_len = 0;
+ zend_str_size_int name_len = 0;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", \
&mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|iS", \
&mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { \
return; }
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1975,10 +1975,10 @@ PHP_FUNCTION(mysqli_stmt_send_long_data)
MY_STMT *stmt;
zval *mysql_stmt;
char *data;
- long param_nr;
- int data_len;
+ php_int_t param_nr;
+ zend_str_size_int data_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", \
&mysql_stmt, mysqli_stmt_class_entry, ¶m_nr, &data, &data_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OiS", \
&mysql_stmt, mysqli_stmt_class_entry, ¶m_nr, &data, &data_len) == FAILURE) { \
return; }
MYSQLI_FETCH_RESOURCE_STMT(stmt, &mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2042,9 +2042,9 @@ PHP_FUNCTION(mysqli_stmt_data_seek)
{
MY_STMT *stmt;
zval *mysql_stmt;
- long offset;
+ php_int_t offset;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", \
&mysql_stmt, mysqli_stmt_class_entry, &offset) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", \
&mysql_stmt, mysqli_stmt_class_entry, &offset) == FAILURE) { return;
}
if (offset < 0) {
@@ -2170,9 +2170,9 @@ PHP_FUNCTION(mysqli_select_db)
MY_MYSQL *mysql;
zval *mysql_link;
char *dbname;
- int dbname_len;
+ zend_str_size_int dbname_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_link, mysqli_link_class_entry, &dbname, &dbname_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_link, mysqli_link_class_entry, &dbname, &dbname_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -2211,9 +2211,10 @@ PHP_FUNCTION(mysqli_ssl_set)
MY_MYSQL *mysql;
zval *mysql_link;
char *ssl_parm[5];
- int ssl_parm_len[5], i;
+ zend_str_size_int ssl_parm_len[5];
+ int i;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osssss", \
&mysql_link, mysqli_link_class_entry, &ssl_parm[0], &ssl_parm_len[0], &ssl_parm[1], \
&ssl_parm_len[1], &ssl_parm[2], &ssl_parm_len[2], &ssl_parm[3], &ssl_parm_len[3], \
&ssl_parm[4], &ssl_parm_len[4]) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSSSSS", \
&mysql_link, mysqli_link_class_entry, &ssl_parm[0], &ssl_parm_len[0], &ssl_parm[1], \
&ssl_parm_len[1], &ssl_parm[2], &ssl_parm_len[2], &ssl_parm[3], &ssl_parm_len[3], \
&ssl_parm[4], &ssl_parm_len[4]) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_INITIALIZED);
@@ -2268,9 +2269,9 @@ PHP_FUNCTION(mysqli_refresh)
{
MY_MYSQL *mysql;
zval *mysql_link = NULL;
- long options;
+ php_int_t options;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", \
&mysql_link, mysqli_link_class_entry, &options) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", \
&mysql_link, mysqli_link_class_entry, &options) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_INITIALIZED);
@@ -2288,15 +2289,15 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
{
MY_STMT *stmt;
zval *mysql_stmt;
- long mode_in;
+ php_int_t mode_in;
#if MYSQL_VERSION_ID >= 50107
my_bool mode_b;
#endif
- ulong mode;
- ulong attr;
+ php_uint_t mode;
+ php_uint_t attr;
void *mode_p;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", \
&mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oii", \
&mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_STMT(stmt, &mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2335,11 +2336,11 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
{
MY_STMT *stmt;
zval *mysql_stmt;
- ulong value = 0;
- ulong attr;
+ php_uint_t value = 0;
+ php_uint_t attr;
int rc;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", \
&mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", \
&mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_STMT(stmt, &mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2352,7 +2353,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
if (attr == STMT_ATTR_UPDATE_MAX_LENGTH)
value = *((my_bool *)&value);
#endif
- RETURN_LONG((long)value);
+ RETURN_LONG((php_uint_t)value);
}
/* }}} */
@@ -2429,9 +2430,9 @@ PHP_FUNCTION(mysqli_stmt_prepare)
MY_STMT *stmt;
zval *mysql_stmt;
char *query;
- int query_len;
+ zend_str_size_int query_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_stmt, mysqli_stmt_class_entry, &query, &query_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_stmt, mysqli_stmt_class_entry, &query, &query_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_STMT(stmt, &mysql_stmt, MYSQLI_STATUS_INITIALIZED);
diff --git a/ext/mysqli/mysqli_embedded.c b/ext/mysqli/mysqli_embedded.c
index 3693777..9bf4c3e 100644
--- a/ext/mysqli/mysqli_embedded.c
+++ b/ext/mysqli/mysqli_embedded.c
@@ -32,7 +32,7 @@
PHP_FUNCTION(mysqli_embedded_server_start)
{
#ifdef HAVE_EMBEDDED_MYSQLI
- long start;
+ php_int_t start;
zval *args;
zval *grps;
@@ -42,7 +42,7 @@ PHP_FUNCTION(mysqli_embedded_server_start)
HashPosition pos;
int index, rc;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "laa", &start, &args, &grps) \
== FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "iaa", &start, \
&args, &grps) == FAILURE) { return;
}
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index c24b974..2cf885e 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -63,10 +63,10 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, \
zend_bool is_real_conne MYSQLI_RESOURCE *mysqli_resource = NULL;
zval *object = getThis();
char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
- int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, \
socket_len = 0; + zend_str_size_int hostname_len = 0, username_len = 0, \
passwd_len = 0, dbname_len = 0, socket_len = 0; zend_bool persistent = FALSE;
- long port = 0, flags = 0;
- uint hash_len;
+ php_int_t port = 0, flags = 0;
+ zend_str_size_uint hash_len;
char *hash_key = NULL;
zend_bool new_connection = FALSE;
zend_rsrc_list_entry *le;
@@ -89,7 +89,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool \
is_real_conne hostname = username = dbname = passwd = socket = NULL;
if (!is_real_connect) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ssssls", &hostname, \
&hostname_len, &username, &username_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() \
TSRMLS_CC, "|SSSSiS", &hostname, &hostname_len, &username, \
&username_len,
&passwd, &passwd_len, &dbname, &dbname_len, &port, &socket, &socket_len) == \
FAILURE) { return;
}
@@ -107,7 +107,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, \
zend_bool is_real_conne flags |= CLIENT_MULTI_RESULTS; /* needed for \
mysql_multi_query() */ } else {
/* We have flags too */
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \
"O|sssslsl", &object, mysqli_link_class_entry, + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|SSSSiSi", \
&object, mysqli_link_class_entry,
&hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, \
&dbname, &dbname_len, &port, &socket, &socket_len, &flags) == FAILURE) {
return;
@@ -367,9 +367,9 @@ PHP_FUNCTION(mysqli_fetch_all)
{
MYSQL_RES *result;
zval *mysql_result;
- long mode = MYSQLND_FETCH_NUM;
+ php_int_t mode = MYSQLND_FETCH_NUM;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", \
&mysql_result, mysqli_result_class_entry, &mode) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", \
&mysql_result, mysqli_result_class_entry, &mode) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", \
MYSQLI_STATUS_VALID); @@ -519,9 +519,9 @@ PHP_FUNCTION(mysqli_multi_query)
MY_MYSQL *mysql;
zval *mysql_link;
char *query = NULL;
- int query_len;
+ zend_str_size_int query_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -564,10 +564,10 @@ PHP_FUNCTION(mysqli_query)
MYSQLI_RESOURCE *mysqli_resource;
MYSQL_RES *result = NULL;
char *query = NULL;
- int query_len;
- long resultmode = MYSQLI_STORE_RESULT;
+ zend_str_size_int query_len;
+ php_int_t resultmode = MYSQLI_STORE_RESULT;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", \
&mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) == FAILURE) { \
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|i", \
&mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) == FAILURE) { \
return; }
@@ -773,11 +773,11 @@ PHP_FUNCTION(mysqli_poll)
{
zval *r_array, *e_array, *dont_poll_array;
MYSQLND **new_r_array = NULL, **new_e_array = NULL, **new_dont_poll_array = NULL;
- long sec = 0, usec = 0;
+ php_int_t sec = 0, usec = 0;
enum_func_status ret;
uint desc_num;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!al|l", &r_array, \
&e_array, &dont_poll_array, &sec, &usec) == FAILURE) { + if \
(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!ai|i", &r_array, &e_array, \
&dont_poll_array, &sec, &usec) == FAILURE) { return;
}
if (sec < 0 || usec < 0) {
@@ -972,9 +972,9 @@ PHP_FUNCTION(mysqli_set_charset)
MY_MYSQL *mysql;
zval *mysql_link;
char *cs_name;
- int csname_len;
+ zend_str_size_int csname_len;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1098,12 +1098,12 @@ PHP_FUNCTION(mysqli_begin_transaction)
{
MY_MYSQL *mysql;
zval *mysql_link;
- long flags = TRANS_START_NO_OPT;
+ php_int_t flags = TRANS_START_NO_OPT;
char * name = NULL;
- int name_len = -1;
+ zend_str_size_int name_len = -1;
zend_bool err = FALSE;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", \
&mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|iS", \
&mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { \
return; }
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1155,9 +1155,9 @@ PHP_FUNCTION(mysqli_savepoint)
MY_MYSQL *mysql;
zval *mysql_link;
char * name = NULL;
- int name_len = -1;
+ zend_str_size_int name_len = -1;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
@@ -1185,9 +1185,9 @@ PHP_FUNCTION(mysqli_release_savepoint)
MY_MYSQL *mysql;
zval *mysql_link;
char * name = NULL;
- int name_len = -1;
+ zend_str_size_int name_len = -1;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", \
&mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { + if \
(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", \
&mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID);
diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h
index d823ea8..a82a20c 100644
--- a/ext/mysqli/mysqli_priv.h
+++ b/ext/mysqli/mysqli_priv.h
@@ -100,8 +100,8 @@ PHP_MYSQLI_EXPORT(zend_object_value) \
mysqli_objects_new(zend_class_entry * TSRML
#define MYSQLI_RETURN_LONG_LONG(__val) \
{ \
- if ((__val) < LONG_MAX) { \
- RETURN_LONG((long) (__val)); \
+ if ((__val) < PHP_INT_MAX) { \
+ RETURN_LONG((php_int_t) (__val)); \
} else { \
char *ret; \
/* always used with my_ulonglong -> %llu */ \
diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c
index 52135ce..64d6efd 100644
--- a/ext/mysqli/mysqli_report.c
+++ b/ext/mysqli/mysqli_report.c
@@ -33,10 +33,10 @@ extern void php_mysqli_throw_sql_exception(char *sqlstate, int \
errorno TSRMLS_DC sets report level */
PHP_FUNCTION(mysqli_report)
{
- long flags;
+ php_int_t flags;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &flags) == FAILURE) {
return;
}
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
index 25653e3..45fac3d 100644
--- a/ext/mysqli/mysqli_warning.c
+++ b/ext/mysqli/mysqli_warning.c
@@ -111,7 +111,7 @@ MYSQLI_WARNING *php_new_warning(const zval * reason, int errorno \
TSRMLS_DC) w->reason = *reason;
zval_copy_ctor(&(w->reason));
- ZVAL_UTF8_STRINGL(&(w->reason), Z_STRVAL(w->reason), Z_STRLEN(w->reason), \
ZSTR_AUTOFREE); + ZVAL_UTF8_STRINGL(&(w->reason), Z_STRVAL(w->reason), \
Z_STRSIZE(w->reason), ZSTR_AUTOFREE);
ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, ZSTR_DUPLICATE);
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 8b329bb..c7b9550 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -99,9 +99,9 @@ enum mysqli_status {
typedef struct {
char *val;
- ulong buflen;
- ulong output_len;
- ulong type;
+ php_uint_t buflen;
+ php_uint_t output_len;
+ php_uint_t type;
} VAR_BUFFER;
typedef struct {
@@ -205,7 +205,7 @@ extern void php_mysqli_close(MY_MYSQL * mysql, int close_type, \
int resource_stat extern zend_object_iterator_funcs \
php_mysqli_result_iterator_funcs; extern zend_object_iterator \
*php_mysqli_result_get_iterator(zend_class_entry *ce, zval *object, int by_ref \
TSRMLS_DC);
-extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, \
long fetchtype TSRMLS_DC); +extern void php_mysqli_fetch_into_hash_aux(zval \
*return_value, MYSQL_RES * result, php_int_t fetchtype TSRMLS_DC);
#ifdef HAVE_SPL
extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
@@ -313,27 +313,27 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
ZEND_BEGIN_MODULE_GLOBALS(mysqli)
- long default_link;
- long num_links;
- long max_links;
- long num_active_persistent;
- long num_inactive_persistent;
- long max_persistent;
- long allow_persistent;
- unsigned long default_port;
+ php_int_t default_link;
+ php_int_t num_links;
+ php_int_t max_links;
+ php_int_t num_active_persistent;
+ php_int_t num_inactive_persistent;
+ php_int_t max_persistent;
+ php_int_t allow_persistent;
+ php_uint_t default_port;
char *default_host;
char *default_user;
char *default_socket;
char *default_pw;
- long reconnect;
- long allow_local_infile;
- long strict;
- long error_no;
+ php_int_t reconnect;
+ php_int_t allow_local_infile;
+ php_int_t strict;
+ php_int_t error_no;
char *error_msg;
- long report_mode;
+ php_int_t report_mode;
HashTable *report_ht;
- unsigned long multi_query;
- unsigned long embedded;
+ php_uint_t multi_query;
+ php_uint_t embedded;
ZEND_END_MODULE_GLOBALS(mysqli)
--
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