From ae2103ba408846441e4394bb4b5fd2b139bdb943 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 1 Dec 2013 09:45:26 +0100 Subject: basic fixes for ext/mysql --- ext/mysql/php_mysql.c | 120 +++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 59 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 88bb9ab21e..7387f22e15 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -80,7 +80,7 @@ static int le_result, le_link, le_plink; #define SAFE_STRING(s) ((s)?(s):"") #if MYSQL_VERSION_ID > 32199 || defined(MYSQL_USE_MYSQLND) -# define mysql_row_length_type unsigned long +# define mysql_row_length_type php_uint_t # define HAVE_MYSQL_ERRNO #else # define mysql_row_length_type unsigned int @@ -720,16 +720,16 @@ PHP_MINFO_FUNCTION(mysql) static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL; - int user_len = 0, passwd_len = 0, host_len = 0; + zend_str_size_int user_len = 0, passwd_len = 0, host_len = 0; char *hashed_details=NULL; int hashed_details_length, port = MYSQL_PORT; - long client_flags = 0; + php_int_t client_flags = 0; php_mysql_conn *mysql=NULL; #if MYSQL_VERSION_ID <= 32230 void (*handler) (int); #endif zend_bool free_host=0, new_link=0; - long connect_timeout; + php_int_t connect_timeout; php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, @@ -775,13 +775,13 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) } else { /* mysql_pconnect does not support new_link parameter */ if (persistent) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!l", &host_and_port, &host_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|S!S!S!i", &host_and_port, &host_len, &user, &user_len, &passwd, &passwd_len, &client_flags)==FAILURE) { return; } } else { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!bl", &host_and_port, &host_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|S!S!S!bi", &host_and_port, &host_len, &user, &user_len, &passwd, &passwd_len, &new_link, &client_flags)==FAILURE) { return; @@ -961,13 +961,13 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) */ if (!new_link && zend_hash_find(&EG(regular_list), hashed_details, hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { int type; - long link; + php_int_t link; void *ptr; if (Z_TYPE_P(index_ptr) != le_index_ptr) { MYSQL_DO_CONNECT_RETURN_FALSE(); } - link = (long) index_ptr->ptr; + link = (php_int_t) index_ptr->ptr; ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==le_link || type==le_plink)) { zend_list_addref(link); @@ -1130,12 +1130,12 @@ PHP_FUNCTION(mysql_close) PHP_FUNCTION(mysql_select_db) { char *db; - int db_len; + zend_str_size_int db_len; zval *mysql_link = NULL; int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mysql_link) == FAILURE) { return; } @@ -1283,7 +1283,7 @@ PHP_FUNCTION(mysql_thread_id) } ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_LONG((long) mysql_thread_id(mysql->conn)); + RETURN_LONG((php_int_t) mysql_thread_id(mysql->conn)); } /* }}} */ @@ -1353,10 +1353,11 @@ PHP_FUNCTION(mysql_set_charset) { zval *mysql_link = NULL; char *csname; - int id = -1, csname_len; + int id = -1; + zend_str_size_int csname_len; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &csname, &csname_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &csname, &csname_len, &mysql_link) == FAILURE) { return; } @@ -1383,12 +1384,12 @@ PHP_FUNCTION(mysql_set_charset) PHP_FUNCTION(mysql_create_db) { char *db; - int db_len; + zend_str_size_int db_len; zval *mysql_link = NULL; int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mysql_link) == FAILURE) { return; } @@ -1414,12 +1415,12 @@ PHP_FUNCTION(mysql_create_db) PHP_FUNCTION(mysql_drop_db) { char *db; - int db_len; + zend_str_size_int db_len; zval *mysql_link = NULL; int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mysql_link) == FAILURE) { return; } @@ -1536,11 +1537,11 @@ static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_l static void php_mysql_do_query(INTERNAL_FUNCTION_PARAMETERS, int use_store) { char *query; - int query_len; + zend_str_size_int query_len; zval *mysql_link = NULL; int id = -1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &query, &query_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &query, &query_len, &mysql_link) == FAILURE) { return; } @@ -1576,11 +1577,11 @@ PHP_FUNCTION(mysql_unbuffered_query) PHP_FUNCTION(mysql_db_query) { char *db, *query; - int db_len, query_len; + zend_str_size_int db_len, query_len; zval *mysql_link = NULL; int id = -1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|r", &db, &db_len, &query, &query_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|r", &db, &db_len, &query, &query_len, &mysql_link) == FAILURE) { return; } @@ -1635,13 +1636,13 @@ PHP_FUNCTION(mysql_list_dbs) PHP_FUNCTION(mysql_list_tables) { char *db; - int db_len; + zend_str_size_int db_len; zval *mysql_link = NULL; int id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mysql_link) == FAILURE) { return; } @@ -1673,13 +1674,13 @@ PHP_FUNCTION(mysql_list_tables) PHP_FUNCTION(mysql_list_fields) { char *db, *table; - int db_len, table_len; + zend_str_size_int db_len, table_len; zval *mysql_link = NULL; int id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|r", &db, &db_len, &table, &table_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|r", &db, &db_len, &table, &table_len, &mysql_link) == FAILURE) { return; } @@ -1821,7 +1822,7 @@ PHP_FUNCTION(mysql_affected_rows) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (long) mysql_affected_rows(mysql->conn); + Z_LVAL_P(return_value) = (php_int_t) mysql_affected_rows(mysql->conn); Z_TYPE_P(return_value) = IS_LONG; } /* }}} */ @@ -1832,9 +1833,9 @@ PHP_FUNCTION(mysql_affected_rows) PHP_FUNCTION(mysql_escape_string) { char *str; - int str_len; + zend_str_size_int str_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &str, &str_len) == FAILURE) { return; } @@ -1844,7 +1845,7 @@ PHP_FUNCTION(mysql_escape_string) */ Z_STRVAL_P(return_value) = (char *) safe_emalloc(str_len, 2, 1); - Z_STRLEN_P(return_value) = mysql_escape_string(Z_STRVAL_P(return_value), str, str_len); + Z_STRSIZE_P(return_value) = mysql_escape_string(Z_STRVAL_P(return_value), str, str_len); Z_TYPE_P(return_value) = IS_STRING; php_error_docref("function.mysql-real-escape-string" TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use mysql_real_escape_string() instead."); @@ -1858,11 +1859,12 @@ PHP_FUNCTION(mysql_real_escape_string) zval *mysql_link = NULL; char *str; char *new_str; - int id = -1, str_len, new_str_len; + int id = -1; + zend_str_size_int str_len, new_str_len; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &str, &str_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &str, &str_len, &mysql_link) == FAILURE) { return; } @@ -1901,7 +1903,7 @@ PHP_FUNCTION(mysql_insert_id) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (long) mysql_insert_id(mysql->conn); + Z_LVAL_P(return_value) = (php_int_t) mysql_insert_id(mysql->conn); Z_TYPE_P(return_value) = IS_LONG; } /* }}} */ @@ -1912,7 +1914,7 @@ PHP_FUNCTION(mysql_insert_id) PHP_FUNCTION(mysql_result) { zval *result, *field=NULL; - long row; + php_int_t row; MYSQL_RES *mysql_result; #ifndef MYSQL_USE_MYSQLND MYSQL_ROW sql_row; @@ -1925,7 +1927,7 @@ johannes TODO: Do 2 zend_parse_parameters calls instead of type "z" and switch below Q: String or long first? */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &result, &row, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri|z", &result, &row, &field) == FAILURE) { return; } @@ -1949,7 +1951,7 @@ Q: String or long first? field_name = estrdup(tmp+1); } else { table_name = NULL; - field_name = estrndup(Z_STRVAL_P(field),Z_STRLEN_P(field)); + field_name = estrndup(Z_STRVAL_P(field),Z_STRSIZE_P(field)); } mysql_field_seek(mysql_result, 0); while ((tmp_field=mysql_fetch_field(mysql_result))) { @@ -1995,11 +1997,11 @@ Q: String or long first? #if PHP_API_VERSION < 20100412 if (PG(magic_quotes_runtime)) { - Z_STRVAL_P(return_value) = php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset],&Z_STRLEN_P(return_value), 0 TSRMLS_CC); + Z_STRVAL_P(return_value) = php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset],&Z_STRSIZE_P(return_value), 0 TSRMLS_CC); } else { #endif - Z_STRLEN_P(return_value) = sql_row_lengths[field_offset]; - Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRLEN_P(return_value)); + Z_STRSIZE_P(return_value) = sql_row_lengths[field_offset]; + Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRSIZE_P(return_value)); #if PHP_API_VERSION < 20100412 } #endif @@ -2027,7 +2029,7 @@ PHP_FUNCTION(mysql_num_rows) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (long) mysql_num_rows(mysql_result); + Z_LVAL_P(return_value) = (php_int_t) mysql_num_rows(mysql_result); Z_TYPE_P(return_value) = IS_LONG; } /* }}} */ @@ -2052,7 +2054,7 @@ PHP_FUNCTION(mysql_num_fields) /* {{{ php_mysql_fetch_hash */ -static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int expected_args, int into_object) +static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, php_int_t result_type, int expected_args, int into_object) { MYSQL_RES *mysql_result; zval *res, *ctor_params = NULL; @@ -2067,9 +2069,9 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, #ifdef ZEND_ENGINE_2 if (into_object) { char *class_name = NULL; - int class_name_len = 0; + zend_str_size_int class_name_len = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|sz", &res, &class_name, &class_name_len, &ctor_params) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|Sz", &res, &class_name, &class_name_len, &ctor_params) == FAILURE) { return; } @@ -2086,7 +2088,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, } else #endif { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &res, &result_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &res, &result_type) == FAILURE) { return; } if (!result_type) { @@ -2123,7 +2125,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, #if PHP_API_VERSION < 20100412 if (PG(magic_quotes_runtime)) { Z_TYPE_P(data) = IS_STRING; - Z_STRVAL_P(data) = php_addslashes(mysql_row[i], mysql_row_lengths[i], &Z_STRLEN_P(data), 0 TSRMLS_CC); + Z_STRVAL_P(data) = php_addslashes(mysql_row[i], mysql_row_lengths[i], &Z_STRSIZE_P(data), 0 TSRMLS_CC); } else { #endif ZVAL_STRINGL(data, mysql_row[i], mysql_row_lengths[i], 1); @@ -2270,10 +2272,10 @@ PHP_FUNCTION(mysql_fetch_assoc) PHP_FUNCTION(mysql_data_seek) { zval *result; - long offset; + php_int_t offset; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset)) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &offset)) { return; } @@ -2398,11 +2400,11 @@ static char *php_mysql_get_field_name(int field_type) PHP_FUNCTION(mysql_fetch_field) { zval *result; - long field=0; + php_int_t field=0; MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &result, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &result, &field) == FAILURE) { return; } @@ -2442,10 +2444,10 @@ PHP_FUNCTION(mysql_fetch_field) PHP_FUNCTION(mysql_field_seek) { zval *result; - long offset; + php_int_t offset; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &offset) == FAILURE) { return; } ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); @@ -2471,13 +2473,13 @@ PHP_FUNCTION(mysql_field_seek) static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zval *result; - long field; + php_int_t field; MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field = {0}; char buf[512]; int len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &field) == FAILURE) { return; } @@ -2494,13 +2496,13 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) switch (entry_type) { case PHP_MYSQL_FIELD_NAME: - Z_STRLEN_P(return_value) = strlen(mysql_field->name); - Z_STRVAL_P(return_value) = estrndup(mysql_field->name, Z_STRLEN_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(mysql_field->name); + Z_STRVAL_P(return_value) = estrndup(mysql_field->name, Z_STRSIZE_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; break; case PHP_MYSQL_FIELD_TABLE: - Z_STRLEN_P(return_value) = strlen(mysql_field->table); - Z_STRVAL_P(return_value) = estrndup(mysql_field->table, Z_STRLEN_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(mysql_field->table); + Z_STRVAL_P(return_value) = estrndup(mysql_field->table, Z_STRSIZE_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; break; case PHP_MYSQL_FIELD_LEN: @@ -2509,8 +2511,8 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) break; case PHP_MYSQL_FIELD_TYPE: Z_STRVAL_P(return_value) = php_mysql_get_field_name(Z_TYPE_P(mysql_field)); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); - Z_STRVAL_P(return_value) = estrndup(Z_STRVAL_P(return_value), Z_STRLEN_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRVAL_P(return_value) = estrndup(Z_STRVAL_P(return_value), Z_STRSIZE_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; break; case PHP_MYSQL_FIELD_FLAGS: @@ -2582,7 +2584,7 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) len--; } - Z_STRLEN_P(return_value) = len; + Z_STRSIZE_P(return_value) = len; Z_STRVAL_P(return_value) = estrndup(buf, len); Z_TYPE_P(return_value) = IS_STRING; break; -- cgit v1.2.1 From 66a42402d9e6dfaed7a299cc814cd568c54a232c Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 1 Dec 2013 12:22:52 +0100 Subject: more fixes for ext/mysql --- ext/mysql/php_mysql.c | 61 ++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 7387f22e15..e5e626acfc 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -121,7 +121,7 @@ static PHP_GINIT_FUNCTION(mysql); typedef struct _php_mysql_conn { MYSQL *conn; - int active_result_id; + php_int_t active_result_id; int multi_query; } php_mysql_conn; @@ -421,7 +421,7 @@ static void _free_mysql_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ php_mysql_set_default_link */ -static void php_mysql_set_default_link(int id TSRMLS_DC) +static void php_mysql_set_default_link(php_int_t id TSRMLS_DC) { if (MySG(default_link) != -1) { zend_list_delete(MySG(default_link)); @@ -722,7 +722,8 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL; zend_str_size_int user_len = 0, passwd_len = 0, host_len = 0; char *hashed_details=NULL; - int hashed_details_length, port = MYSQL_PORT; + zend_str_size_int hashed_details_length; + php_int_t port = MYSQL_PORT; php_int_t client_flags = 0; php_mysql_conn *mysql=NULL; #if MYSQL_VERSION_ID <= 32230 @@ -1056,7 +1057,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* {{{ php_mysql_get_default_link */ -static int php_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) +static php_int_t php_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (MySG(default_link)==-1) { /* no link opened yet, implicitly open one */ ht = 0; @@ -1086,7 +1087,7 @@ PHP_FUNCTION(mysql_pconnect) Close a MySQL connection */ PHP_FUNCTION(mysql_close) { - int resource_id; + php_int_t resource_id; zval *mysql_link=NULL; php_mysql_conn *mysql; @@ -1132,7 +1133,7 @@ PHP_FUNCTION(mysql_select_db) char *db; zend_str_size_int db_len; zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mysql_link) == FAILURE) { @@ -1173,7 +1174,7 @@ PHP_FUNCTION(mysql_get_client_info) PHP_FUNCTION(mysql_get_host_info) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1196,7 +1197,7 @@ PHP_FUNCTION(mysql_get_host_info) PHP_FUNCTION(mysql_get_proto_info) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1219,7 +1220,7 @@ PHP_FUNCTION(mysql_get_proto_info) PHP_FUNCTION(mysql_get_server_info) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1242,7 +1243,7 @@ PHP_FUNCTION(mysql_get_server_info) PHP_FUNCTION(mysql_info) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; char *str; php_mysql_conn *mysql; @@ -1270,7 +1271,7 @@ PHP_FUNCTION(mysql_info) PHP_FUNCTION(mysql_thread_id) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1292,7 +1293,7 @@ PHP_FUNCTION(mysql_thread_id) PHP_FUNCTION(mysql_stat) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; char *stat; #ifdef MYSQL_USE_MYSQLND @@ -1328,7 +1329,7 @@ PHP_FUNCTION(mysql_stat) PHP_FUNCTION(mysql_client_encoding) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1353,7 +1354,7 @@ PHP_FUNCTION(mysql_set_charset) { zval *mysql_link = NULL; char *csname; - int id = -1; + php_int_t id = -1; zend_str_size_int csname_len; php_mysql_conn *mysql; @@ -1386,7 +1387,7 @@ PHP_FUNCTION(mysql_create_db) char *db; zend_str_size_int db_len; zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mysql_link) == FAILURE) { @@ -1417,7 +1418,7 @@ PHP_FUNCTION(mysql_drop_db) char *db; zend_str_size_int db_len; zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mysql_link) == FAILURE) { @@ -1539,7 +1540,7 @@ static void php_mysql_do_query(INTERNAL_FUNCTION_PARAMETERS, int use_store) char *query; zend_str_size_int query_len; zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &query, &query_len, &mysql_link) == FAILURE) { return; @@ -1579,7 +1580,7 @@ PHP_FUNCTION(mysql_db_query) char *db, *query; zend_str_size_int db_len, query_len; zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|r", &db, &db_len, &query, &query_len, &mysql_link) == FAILURE) { return; @@ -1602,7 +1603,7 @@ PHP_FUNCTION(mysql_db_query) PHP_FUNCTION(mysql_list_dbs) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; @@ -1638,7 +1639,7 @@ PHP_FUNCTION(mysql_list_tables) char *db; zend_str_size_int db_len; zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; @@ -1676,7 +1677,7 @@ PHP_FUNCTION(mysql_list_fields) char *db, *table; zend_str_size_int db_len, table_len; zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; @@ -1711,7 +1712,7 @@ PHP_FUNCTION(mysql_list_fields) PHP_FUNCTION(mysql_list_processes) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; @@ -1745,7 +1746,7 @@ PHP_FUNCTION(mysql_list_processes) PHP_FUNCTION(mysql_error) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1776,7 +1777,7 @@ PHP_FUNCTION(mysql_error) PHP_FUNCTION(mysql_errno) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1807,7 +1808,7 @@ PHP_FUNCTION(mysql_errno) PHP_FUNCTION(mysql_affected_rows) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1859,7 +1860,7 @@ PHP_FUNCTION(mysql_real_escape_string) zval *mysql_link = NULL; char *str; char *new_str; - int id = -1; + php_int_t id = -1; zend_str_size_int str_len, new_str_len; php_mysql_conn *mysql; @@ -1888,7 +1889,7 @@ PHP_FUNCTION(mysql_real_escape_string) PHP_FUNCTION(mysql_insert_id) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { @@ -1920,7 +1921,7 @@ PHP_FUNCTION(mysql_result) MYSQL_ROW sql_row; mysql_row_length_type *sql_row_lengths; #endif - int field_offset=0; + php_int_t field_offset=0; /* johannes TODO: @@ -2477,7 +2478,7 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field = {0}; char buf[512]; - int len; + zend_str_size_int len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &field) == FAILURE) { return; @@ -2667,7 +2668,7 @@ PHP_FUNCTION(mysql_free_result) PHP_FUNCTION(mysql_ping) { zval *mysql_link = NULL; - int id = -1; + php_int_t id = -1; php_mysql_conn *mysql; if (0 == ZEND_NUM_ARGS()) { -- cgit v1.2.1 From b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 18 Dec 2013 14:46:44 -0800 Subject: mass replacement for zend_size_t/php_size_t --- ext/mysql/php_mysql.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index e5e626acfc..dc42729bb4 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -720,9 +720,9 @@ PHP_MINFO_FUNCTION(mysql) static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL; - zend_str_size_int user_len = 0, passwd_len = 0, host_len = 0; + php_size_t user_len = 0, passwd_len = 0, host_len = 0; char *hashed_details=NULL; - zend_str_size_int hashed_details_length; + php_size_t hashed_details_length; php_int_t port = MYSQL_PORT; php_int_t client_flags = 0; php_mysql_conn *mysql=NULL; @@ -1131,7 +1131,7 @@ PHP_FUNCTION(mysql_close) PHP_FUNCTION(mysql_select_db) { char *db; - zend_str_size_int db_len; + php_size_t db_len; zval *mysql_link = NULL; php_int_t id = -1; php_mysql_conn *mysql; @@ -1355,7 +1355,7 @@ PHP_FUNCTION(mysql_set_charset) zval *mysql_link = NULL; char *csname; php_int_t id = -1; - zend_str_size_int csname_len; + php_size_t csname_len; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &csname, &csname_len, &mysql_link) == FAILURE) { @@ -1385,7 +1385,7 @@ PHP_FUNCTION(mysql_set_charset) PHP_FUNCTION(mysql_create_db) { char *db; - zend_str_size_int db_len; + php_size_t db_len; zval *mysql_link = NULL; php_int_t id = -1; php_mysql_conn *mysql; @@ -1416,7 +1416,7 @@ PHP_FUNCTION(mysql_create_db) PHP_FUNCTION(mysql_drop_db) { char *db; - zend_str_size_int db_len; + php_size_t db_len; zval *mysql_link = NULL; php_int_t id = -1; php_mysql_conn *mysql; @@ -1538,7 +1538,7 @@ static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_l static void php_mysql_do_query(INTERNAL_FUNCTION_PARAMETERS, int use_store) { char *query; - zend_str_size_int query_len; + php_size_t query_len; zval *mysql_link = NULL; php_int_t id = -1; @@ -1578,7 +1578,7 @@ PHP_FUNCTION(mysql_unbuffered_query) PHP_FUNCTION(mysql_db_query) { char *db, *query; - zend_str_size_int db_len, query_len; + php_size_t db_len, query_len; zval *mysql_link = NULL; php_int_t id = -1; @@ -1637,7 +1637,7 @@ PHP_FUNCTION(mysql_list_dbs) PHP_FUNCTION(mysql_list_tables) { char *db; - zend_str_size_int db_len; + php_size_t db_len; zval *mysql_link = NULL; php_int_t id = -1; php_mysql_conn *mysql; @@ -1675,7 +1675,7 @@ PHP_FUNCTION(mysql_list_tables) PHP_FUNCTION(mysql_list_fields) { char *db, *table; - zend_str_size_int db_len, table_len; + php_size_t db_len, table_len; zval *mysql_link = NULL; php_int_t id = -1; php_mysql_conn *mysql; @@ -1834,7 +1834,7 @@ PHP_FUNCTION(mysql_affected_rows) PHP_FUNCTION(mysql_escape_string) { char *str; - zend_str_size_int str_len; + php_size_t str_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &str, &str_len) == FAILURE) { return; @@ -1861,7 +1861,7 @@ PHP_FUNCTION(mysql_real_escape_string) char *str; char *new_str; php_int_t id = -1; - zend_str_size_int str_len, new_str_len; + php_size_t str_len, new_str_len; php_mysql_conn *mysql; @@ -2070,7 +2070,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, php_int_t result_ #ifdef ZEND_ENGINE_2 if (into_object) { char *class_name = NULL; - zend_str_size_int class_name_len = 0; + php_size_t class_name_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|Sz", &res, &class_name, &class_name_len, &ctor_params) == FAILURE) { return; @@ -2478,7 +2478,7 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field = {0}; char buf[512]; - zend_str_size_int len; + php_size_t len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &field) == FAILURE) { return; -- cgit v1.2.1 From f58d0b35edf25a8f39fad6bd5e0e4eeb5cdfe9a7 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 05:07:37 -0800 Subject: massive update semantical LONG vs INT replacements --- ext/mysql/php_mysql.c | 86 +++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index dc42729bb4..ddfd3a4f09 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -565,15 +565,15 @@ ZEND_MODULE_STARTUP_D(mysql) le_plink = zend_register_list_destructors_ex(NULL, _close_mysql_plink, "mysql link persistent", module_number); Z_TYPE(mysql_module_entry) = type; - REGISTER_LONG_CONSTANT("MYSQL_ASSOC", MYSQL_ASSOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_NUM", MYSQL_NUM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_BOTH", MYSQL_BOTH, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_COMPRESS", CLIENT_COMPRESS, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_ASSOC", MYSQL_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_NUM", MYSQL_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_BOTH", MYSQL_BOTH, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_COMPRESS", CLIENT_COMPRESS, CONST_CS | CONST_PERSISTENT); #if MYSQL_VERSION_ID >= 40000 - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT); #endif - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); #ifndef MYSQL_USE_MYSQLND #if MYSQL_VERSION_ID >= 40000 @@ -972,7 +972,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==le_link || type==le_plink)) { zend_list_addref(link); - Z_LVAL_P(return_value) = link; + Z_IVAL_P(return_value) = link; php_mysql_set_default_link(link TSRMLS_CC); Z_TYPE_P(return_value) = IS_RESOURCE; efree(hashed_details); @@ -1040,7 +1040,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) ZEND_REGISTER_RESOURCE(return_value, mysql, le_link); /* add it to the hash */ - new_index_ptr.ptr = (void *) Z_LVAL_P(return_value); + new_index_ptr.ptr = (void *) Z_IVAL_P(return_value); Z_TYPE(new_index_ptr) = le_index_ptr; if (zend_hash_update(&EG(regular_list), hashed_details, hashed_details_length+1,(void *) &new_index_ptr, sizeof(zend_rsrc_list_entry), NULL)==FAILURE) { efree(hashed_details); @@ -1050,7 +1050,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) } efree(hashed_details); - php_mysql_set_default_link(Z_LVAL_P(return_value) TSRMLS_CC); + php_mysql_set_default_link(Z_IVAL_P(return_value) TSRMLS_CC); MYSQL_DO_CONNECT_CLEANUP(); } /* }}} */ @@ -1211,7 +1211,7 @@ PHP_FUNCTION(mysql_get_proto_info) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_LONG(mysql_get_proto_info(mysql->conn)); + RETURN_INT(mysql_get_proto_info(mysql->conn)); } /* }}} */ @@ -1284,7 +1284,7 @@ PHP_FUNCTION(mysql_thread_id) } ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_LONG((php_int_t) mysql_thread_id(mysql->conn)); + RETURN_INT((php_int_t) mysql_thread_id(mysql->conn)); } /* }}} */ @@ -1528,7 +1528,7 @@ static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_l MySG(result_allocated)++; ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result); if (use_store == MYSQL_USE_RESULT) { - mysql->active_result_id = Z_LVAL_P(return_value); + mysql->active_result_id = Z_IVAL_P(return_value); } } /* }}} */ @@ -1788,7 +1788,7 @@ PHP_FUNCTION(mysql_errno) id = MySG(default_link); if (id==-1) { if (MySG(connect_errno)!=0){ - RETURN_LONG(MySG(connect_errno)); + RETURN_INT(MySG(connect_errno)); } else { RETURN_FALSE; } @@ -1797,7 +1797,7 @@ PHP_FUNCTION(mysql_errno) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_LONG(mysql_errno(mysql->conn)); + RETURN_INT(mysql_errno(mysql->conn)); } #endif /* }}} */ @@ -1823,8 +1823,8 @@ PHP_FUNCTION(mysql_affected_rows) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (php_int_t) mysql_affected_rows(mysql->conn); - Z_TYPE_P(return_value) = IS_LONG; + Z_IVAL_P(return_value) = (php_int_t) mysql_affected_rows(mysql->conn); + Z_TYPE_P(return_value) = IS_INT; } /* }}} */ @@ -1904,8 +1904,8 @@ PHP_FUNCTION(mysql_insert_id) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (php_int_t) mysql_insert_id(mysql->conn); - Z_TYPE_P(return_value) = IS_LONG; + Z_IVAL_P(return_value) = (php_int_t) mysql_insert_id(mysql->conn); + Z_TYPE_P(return_value) = IS_INT; } /* }}} */ @@ -1935,7 +1935,7 @@ Q: String or long first? ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); if (row<0 || row>=(int)mysql_num_rows(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %ld on MySQL result index %ld", row, Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %ld on MySQL result index %ld", row, Z_IVAL_P(result)); RETURN_FALSE; } mysql_data_seek(mysql_result, row); @@ -1964,7 +1964,7 @@ Q: String or long first? } if (!tmp_field) { /* no match found */ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s%s%s not found in MySQL result index %ld", - (table_name?table_name:""), (table_name?".":""), field_name, Z_LVAL_P(result)); + (table_name?table_name:""), (table_name?".":""), field_name, Z_IVAL_P(result)); efree(field_name); if (table_name) { efree(table_name); @@ -1978,8 +1978,8 @@ Q: String or long first? } break; default: - convert_to_long_ex(&field); - field_offset = Z_LVAL_P(field); + convert_to_int_ex(&field); + field_offset = Z_IVAL_P(field); if (field_offset<0 || field_offset>=(int)mysql_num_fields(mysql_result)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset specified"); RETURN_FALSE; @@ -2030,8 +2030,8 @@ PHP_FUNCTION(mysql_num_rows) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (php_int_t) mysql_num_rows(mysql_result); - Z_TYPE_P(return_value) = IS_LONG; + Z_IVAL_P(return_value) = (php_int_t) mysql_num_rows(mysql_result); + Z_TYPE_P(return_value) = IS_INT; } /* }}} */ @@ -2048,8 +2048,8 @@ PHP_FUNCTION(mysql_num_fields) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); - Z_LVAL_P(return_value) = mysql_num_fields(mysql_result); - Z_TYPE_P(return_value) = IS_LONG; + Z_IVAL_P(return_value) = mysql_num_fields(mysql_result); + Z_TYPE_P(return_value) = IS_INT; } /* }}} */ @@ -2283,7 +2283,7 @@ PHP_FUNCTION(mysql_data_seek) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); if (offset<0 || offset>=(int)mysql_num_rows(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset %ld is invalid for MySQL result index %ld (or the query data is unbuffered)", offset, Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset %ld is invalid for MySQL result index %ld (or the query data is unbuffered)", offset, Z_IVAL_P(result)); RETURN_FALSE; } mysql_data_seek(mysql_result, offset); @@ -2426,16 +2426,16 @@ PHP_FUNCTION(mysql_fetch_field) add_property_string(return_value, "name",(mysql_field->name?mysql_field->name:""), 1); add_property_string(return_value, "table",(mysql_field->table?mysql_field->table:""), 1); add_property_string(return_value, "def",(mysql_field->def?mysql_field->def:""), 1); - add_property_long(return_value, "max_length", mysql_field->max_length); - add_property_long(return_value, "not_null", IS_NOT_NULL(mysql_field->flags)?1:0); - add_property_long(return_value, "primary_key", IS_PRI_KEY(mysql_field->flags)?1:0); - add_property_long(return_value, "multiple_key",(mysql_field->flags&MULTIPLE_KEY_FLAG?1:0)); - add_property_long(return_value, "unique_key",(mysql_field->flags&UNIQUE_KEY_FLAG?1:0)); - add_property_long(return_value, "numeric", IS_NUM(Z_TYPE_P(mysql_field))?1:0); - add_property_long(return_value, "blob", IS_BLOB(mysql_field->flags)?1:0); + add_property_int(return_value, "max_length", mysql_field->max_length); + add_property_int(return_value, "not_null", IS_NOT_NULL(mysql_field->flags)?1:0); + add_property_int(return_value, "primary_key", IS_PRI_KEY(mysql_field->flags)?1:0); + add_property_int(return_value, "multiple_key",(mysql_field->flags&MULTIPLE_KEY_FLAG?1:0)); + add_property_int(return_value, "unique_key",(mysql_field->flags&UNIQUE_KEY_FLAG?1:0)); + add_property_int(return_value, "numeric", IS_NUM(Z_TYPE_P(mysql_field))?1:0); + add_property_int(return_value, "blob", IS_BLOB(mysql_field->flags)?1:0); add_property_string(return_value, "type", php_mysql_get_field_name(Z_TYPE_P(mysql_field)), 1); - add_property_long(return_value, "unsigned",(mysql_field->flags&UNSIGNED_FLAG?1:0)); - add_property_long(return_value, "zerofill",(mysql_field->flags&ZEROFILL_FLAG?1:0)); + add_property_int(return_value, "unsigned",(mysql_field->flags&UNSIGNED_FLAG?1:0)); + add_property_int(return_value, "zerofill",(mysql_field->flags&ZEROFILL_FLAG?1:0)); } /* }}} */ @@ -2454,7 +2454,7 @@ PHP_FUNCTION(mysql_field_seek) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); if (offset<0 || offset>=(int)mysql_num_fields(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for MySQL result index %ld", offset, Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for MySQL result index %ld", offset, Z_IVAL_P(result)); RETURN_FALSE; } mysql_field_seek(mysql_result, offset); @@ -2487,7 +2487,7 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); if (field<0 || field>=(int)mysql_num_fields(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for MySQL result index %ld", field, Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for MySQL result index %ld", field, Z_IVAL_P(result)); RETURN_FALSE; } mysql_field_seek(mysql_result, field); @@ -2507,8 +2507,8 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) Z_TYPE_P(return_value) = IS_STRING; break; case PHP_MYSQL_FIELD_LEN: - Z_LVAL_P(return_value) = mysql_field->length; - Z_TYPE_P(return_value) = IS_LONG; + Z_IVAL_P(return_value) = mysql_field->length; + Z_TYPE_P(return_value) = IS_INT; break; case PHP_MYSQL_FIELD_TYPE: Z_STRVAL_P(return_value) = php_mysql_get_field_name(Z_TYPE_P(mysql_field)); @@ -2652,13 +2652,13 @@ PHP_FUNCTION(mysql_free_result) return; } - if (Z_LVAL_P(result)==0) { + if (Z_IVAL_P(result)==0) { RETURN_FALSE; } ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); - zend_list_delete(Z_LVAL_P(result)); + zend_list_delete(Z_IVAL_P(result)); RETURN_TRUE; } /* }}} */ -- cgit v1.2.1 From 6125278290aa3ab2ac0a1ad22116b9d363b3e915 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 08:40:41 -0800 Subject: more semantical replacements LONG vs. INT --- ext/mysql/php_mysql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index ddfd3a4f09..126fb4cef1 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -2315,7 +2315,7 @@ PHP_FUNCTION(mysql_fetch_lengths) num_fields = mysql_num_fields(mysql_result); for (i=0; i Date: Thu, 9 Jan 2014 04:18:37 +0100 Subject: revamp mysqlnd, mysqli, mysql and pdo_mysql --- ext/mysql/php_mysql.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index ad209ddcf7..2b9e5c37d2 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; -- cgit v1.2.1 From 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 08:07:31 +0200 Subject: basic macro replacements, all at once --- ext/mysql/php_mysql.c | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index f4124d306b..d492147c7f 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -568,15 +568,15 @@ ZEND_MODULE_STARTUP_D(mysql) le_plink = zend_register_list_destructors_ex(NULL, _close_mysql_plink, "mysql link persistent", module_number); mysql_module_entry.type = type; - REGISTER_LONG_CONSTANT("MYSQL_ASSOC", MYSQL_ASSOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_NUM", MYSQL_NUM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_BOTH", MYSQL_BOTH, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_COMPRESS", CLIENT_COMPRESS, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_ASSOC", MYSQL_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_NUM", MYSQL_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_BOTH", MYSQL_BOTH, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_COMPRESS", CLIENT_COMPRESS, CONST_CS | CONST_PERSISTENT); #if MYSQL_VERSION_ID >= 40000 - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT); #endif - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); #ifndef MYSQL_USE_MYSQLND #if MYSQL_VERSION_ID >= 40000 @@ -820,7 +820,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) client_flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via connect parameter */ #endif hashed_details = STR_ALLOC(sizeof("mysql____") + (host_and_port? strlen(host_and_port) : 0) - + (user? strlen(user) : 0) + (passwd? strlen(passwd) : 0) + MAX_LENGTH_OF_LONG - 1, 0); + + (user? strlen(user) : 0) + (passwd? strlen(passwd) : 0) + MAX_LENGTH_OF_ZEND_INT - 1, 0); hashed_details->len = snprintf(hashed_details->val, hashed_details->len + 1, "mysql_%s_%s_%s_%ld", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); } @@ -1225,7 +1225,7 @@ PHP_FUNCTION(mysql_get_proto_info) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, -1, "MySQL-Link", le_link, le_plink); } - RETURN_LONG(mysql_get_proto_info(mysql->conn)); + RETURN_INT(mysql_get_proto_info(mysql->conn)); } /* }}} */ @@ -1299,7 +1299,7 @@ PHP_FUNCTION(mysql_thread_id) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, -1, "MySQL-Link", le_link, le_plink); } - RETURN_LONG((long) mysql_thread_id(mysql->conn)); + RETURN_INT((long) mysql_thread_id(mysql->conn)); } /* }}} */ @@ -1802,7 +1802,7 @@ PHP_FUNCTION(mysql_errno) if (!mysql_link) { if (MySG(default_link) == NULL) { if (MySG(connect_error) != NULL){ - RETURN_LONG(MySG(connect_errno)); + RETURN_INT(MySG(connect_errno)); } else { RETURN_FALSE; } @@ -1812,7 +1812,7 @@ PHP_FUNCTION(mysql_errno) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, -1, "MySQL-Link", le_link, le_plink); } - RETURN_LONG(mysql_errno(mysql->conn)); + RETURN_INT(mysql_errno(mysql->conn)); } #endif /* }}} */ @@ -1837,7 +1837,7 @@ PHP_FUNCTION(mysql_affected_rows) } /* conversion from int64 to long happing here */ - RETURN_LONG((long)mysql_affected_rows(mysql->conn)); + RETURN_INT((long)mysql_affected_rows(mysql->conn)); } /* }}} */ @@ -1918,7 +1918,7 @@ PHP_FUNCTION(mysql_insert_id) } /* conversion from int64 to long happing here */ - RETURN_LONG((long)mysql_insert_id(mysql->conn)); + RETURN_INT((long)mysql_insert_id(mysql->conn)); } /* }}} */ @@ -1964,7 +1964,7 @@ Q: String or long first? field_name = estrdup(tmp + 1); } else { table_name = NULL; - field_name = estrndup(Z_STRVAL_P(field),Z_STRLEN_P(field)); + field_name = estrndup(Z_STRVAL_P(field),Z_STRSIZE_P(field)); } mysql_field_seek(mysql_result, 0); while ((tmp_field = mysql_fetch_field(mysql_result))) { @@ -1992,8 +1992,8 @@ Q: String or long first? } break; default: - convert_to_long_ex(field); - field_offset = Z_LVAL_P(field); + convert_to_int_ex(field); + field_offset = Z_IVAL_P(field); if (field_offset < 0 || field_offset >= (int)mysql_num_fields(mysql_result)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset specified"); RETURN_FALSE; @@ -2040,7 +2040,7 @@ PHP_FUNCTION(mysql_num_rows) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL result", le_result); /* conversion from int64 to long happing here */ - RETURN_LONG((long) mysql_num_rows(mysql_result)); + RETURN_INT((long) mysql_num_rows(mysql_result)); } /* }}} */ @@ -2057,7 +2057,7 @@ PHP_FUNCTION(mysql_num_fields) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL result", le_result); - RETURN_LONG(mysql_num_fields(mysql_result)); + RETURN_INT(mysql_num_fields(mysql_result)); } /* }}} */ @@ -2312,7 +2312,7 @@ PHP_FUNCTION(mysql_fetch_lengths) num_fields = mysql_num_fields(mysql_result); for (i=0; itable?mysql_field->table:""), mysql_field->table_length); add_property_stringl(return_value, "def", (mysql_field->def?mysql_field->def:""), mysql_field->def_length); - add_property_long(return_value, "max_length", mysql_field->max_length); - add_property_long(return_value, "not_null", IS_NOT_NULL(mysql_field->flags)?1:0); - add_property_long(return_value, "primary_key", IS_PRI_KEY(mysql_field->flags)?1:0); - add_property_long(return_value, "multiple_key", (mysql_field->flags&MULTIPLE_KEY_FLAG?1:0)); - add_property_long(return_value, "unique_key", (mysql_field->flags&UNIQUE_KEY_FLAG?1:0)); - add_property_long(return_value, "numeric", IS_NUM(mysql_field->type)?1:0); - add_property_long(return_value, "blob", IS_BLOB(mysql_field->flags)?1:0); + add_property_int(return_value, "max_length", mysql_field->max_length); + add_property_int(return_value, "not_null", IS_NOT_NULL(mysql_field->flags)?1:0); + add_property_int(return_value, "primary_key", IS_PRI_KEY(mysql_field->flags)?1:0); + add_property_int(return_value, "multiple_key", (mysql_field->flags&MULTIPLE_KEY_FLAG?1:0)); + add_property_int(return_value, "unique_key", (mysql_field->flags&UNIQUE_KEY_FLAG?1:0)); + add_property_int(return_value, "numeric", IS_NUM(mysql_field->type)?1:0); + add_property_int(return_value, "blob", IS_BLOB(mysql_field->flags)?1:0); add_property_string(return_value, "type", php_mysql_get_field_name(mysql_field->type)); - add_property_long(return_value, "unsigned", (mysql_field->flags&UNSIGNED_FLAG?1:0)); - add_property_long(return_value, "zerofill", (mysql_field->flags&ZEROFILL_FLAG?1:0)); + add_property_int(return_value, "unsigned", (mysql_field->flags&UNSIGNED_FLAG?1:0)); + add_property_int(return_value, "zerofill", (mysql_field->flags&ZEROFILL_FLAG?1:0)); } /* }}} */ @@ -2506,7 +2506,7 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) RETVAL_STRING(mysql_field->table); break; case PHP_MYSQL_FIELD_LEN: - RETVAL_LONG(mysql_field->length); + RETVAL_INT(mysql_field->length); break; case PHP_MYSQL_FIELD_TYPE: RETVAL_STRING(php_mysql_get_field_name(mysql_field->type)); -- cgit v1.2.1 From bdbf47df181bdafc1b2bc2df1d23815f01510b88 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 16:51:06 +0200 Subject: ported mysql and mysqlnd --- ext/mysql/php_mysql.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index d492147c7f..b0596c396a 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -80,7 +80,7 @@ static int le_result, le_link, le_plink; #define SAFE_STRING(s) ((s)?(s):"") #if MYSQL_VERSION_ID > 32199 || defined(MYSQL_USE_MYSQLND) -# define mysql_row_length_type unsigned long +# define mysql_row_length_type php_uint_t # define HAVE_MYSQL_ERRNO #else # define mysql_row_length_type unsigned int @@ -727,12 +727,12 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) char *tmp = NULL, *host = NULL; int user_len = 0, passwd_len = 0, host_len = 0; int port = MYSQL_PORT; - long client_flags = 0; + php_int_t client_flags = 0; php_mysql_conn *mysql = NULL; #if MYSQL_VERSION_ID <= 32230 void (*handler) (int); #endif - long connect_timeout; + php_int_t connect_timeout; zend_string *hashed_details = NULL; zend_bool free_host = 0, new_link = 0; @@ -780,13 +780,13 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) } else { /* mysql_pconnect does not support new_link parameter */ if (persistent) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!l", &host_and_port, &host_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!i", &host_and_port, &host_len, &user, &user_len, &passwd, &passwd_len, &client_flags)==FAILURE) { return; } } else { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!bl", &host_and_port, &host_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!bi", &host_and_port, &host_len, &user, &user_len, &passwd, &passwd_len, &new_link, &client_flags)==FAILURE) { return; @@ -1927,7 +1927,7 @@ PHP_FUNCTION(mysql_insert_id) PHP_FUNCTION(mysql_result) { zval *result, *field=NULL; - long row; + php_int_t row; MYSQL_RES *mysql_result; #ifndef MYSQL_USE_MYSQLND MYSQL_ROW sql_row; @@ -1940,7 +1940,7 @@ johannes TODO: Do 2 zend_parse_parameters calls instead of type "z" and switch below Q: String or long first? */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &result, &row, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri|z", &result, &row, &field) == FAILURE) { return; } @@ -2063,7 +2063,7 @@ PHP_FUNCTION(mysql_num_fields) /* {{{ php_mysql_fetch_hash */ -static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int expected_args, int into_object) +static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, php_int_t result_type, int expected_args, int into_object) { MYSQL_RES *mysql_result; zval *res, *ctor_params = NULL; @@ -2096,7 +2096,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, } else #endif { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &res, &result_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &res, &result_type) == FAILURE) { return; } if (!result_type) { @@ -2271,10 +2271,10 @@ PHP_FUNCTION(mysql_fetch_assoc) PHP_FUNCTION(mysql_data_seek) { zval *result; - long offset; + php_int_t offset; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset)) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &offset)) { return; } @@ -2398,11 +2398,11 @@ static char *php_mysql_get_field_name(int field_type) PHP_FUNCTION(mysql_fetch_field) { zval *result; - long field=0; + php_int_t field=0; MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &result, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &result, &field) == FAILURE) { return; } @@ -2445,10 +2445,10 @@ PHP_FUNCTION(mysql_fetch_field) PHP_FUNCTION(mysql_field_seek) { zval *result; - long offset; + php_int_t offset; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &offset) == FAILURE) { return; } ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL result", le_result); @@ -2473,13 +2473,13 @@ PHP_FUNCTION(mysql_field_seek) static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zval *result; - long field; + php_int_t field; MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field = {0}; char buf[512]; int len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &result, &field) == FAILURE) { return; } -- cgit v1.2.1