archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql

Browse source
This commit is contained in:
Kalle Sommer Nielsen 2009-05-20 08:29:23 +00:00
parent f1fd8628a0
commit b3e899e7ca
5 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mysql/php_mysql.c
View file

@ -625,7 +625,9 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
int hashed_details_length, port = MYSQL_PORT; int hashed_details_length, port = MYSQL_PORT;
long client_flags = 0; long client_flags = 0;
php_mysql_conn *mysql=NULL; php_mysql_conn *mysql=NULL;
#if !defined(MYSQL_USE_MYSQLND) && !defined(MYSQL_HASH_SET_CHARSET)
char *encoding; char *encoding;
#endif
#if MYSQL_VERSION_ID <= 32230 #if MYSQL_VERSION_ID <= 32230
void (*handler) (int); void (*handler) (int);
#endif #endif
@ -1185,7 +1187,7 @@ PHP_FUNCTION(mysql_thread_id)
} }
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink);
RETURN_LONG(mysql_thread_id(mysql->conn)); RETURN_LONG((long) mysql_thread_id(mysql->conn));
} }
/* }}} */ /* }}} */

8
ext/mysqli/mysqli_api.c
View file

@ -158,7 +158,7 @@ static
int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned int num_vars, int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned int num_vars,
zval ***args, unsigned int start, const char * const types TSRMLS_DC) zval ***args, unsigned int start, const char * const types TSRMLS_DC)
{ {
int i; unsigned int i;
MYSQLND_PARAM_BIND *params; MYSQLND_PARAM_BIND *params;
enum_func_status ret = FAIL; enum_func_status ret = FAIL;
@ -1123,7 +1123,7 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
if (offset < 0 || offset >= mysql_num_fields(result)) { if (offset < 0 || offset >= (long) mysql_num_fields(result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field offset is invalid for resultset"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field offset is invalid for resultset");
RETURN_FALSE; RETURN_FALSE;
} }
@ -2142,7 +2142,7 @@ PHP_FUNCTION(mysqli_refresh)
return; return;
} }
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_INITIALIZED); MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_INITIALIZED);
RETURN_BOOL(!mysql_refresh(mysql->mysql, options)); RETURN_BOOL(!mysql_refresh(mysql->mysql, (uint8_t) options));
} }
/* }}} */ /* }}} */
@ -2416,7 +2416,7 @@ PHP_FUNCTION(mysqli_thread_id)
} }
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID);
RETURN_LONG(mysql_thread_id(mysql->mysql)); RETURN_LONG((long) mysql_thread_id(mysql->mysql));
} }
/* }}} */ /* }}} */

2
ext/mysqli/mysqli_driver.c
View file

@ -134,12 +134,14 @@ MAP_PROPERTY_MYG_LONG_READ(driver_report_read, report_mode);
ZEND_FUNCTION(mysqli_driver_construct) ZEND_FUNCTION(mysqli_driver_construct)
{ {
#if G0
MYSQLI_RESOURCE *mysqli_resource; MYSQLI_RESOURCE *mysqli_resource;
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource->ptr = 1; mysqli_resource->ptr = 1;
mysqli_resource->status = (ZEND_NUM_ARGS() == 1) ? MYSQLI_STATUS_INITIALIZED : MYSQLI_STATUS_VALID; mysqli_resource->status = (ZEND_NUM_ARGS() == 1) ? MYSQLI_STATUS_INITIALIZED : MYSQLI_STATUS_VALID;
((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource; ((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource;
#endif
} }
const mysqli_property_entry mysqli_driver_property_entries[] = { const mysqli_property_entry mysqli_driver_property_entries[] = {

16
ext/mysqli/mysqli_prop.c
View file

@ -85,7 +85,7 @@ static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
} else {\ } else {\
l = (__ret_type)__int_func(p);\ l = (__ret_type)__int_func(p);\
if (l < LONG_MAX) {\ if (l < LONG_MAX) {\
ZVAL_LONG(*retval, l);\ ZVAL_LONG(*retval, (long) l);\
} else { \ } else { \
char *ret; \ char *ret; \
int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \ int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \
@ -158,7 +158,7 @@ static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
my_ulonglong rc; long rc;
MAKE_STD_ZVAL(*retval); MAKE_STD_ZVAL(*retval);
@ -171,9 +171,9 @@ static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
} else { } else {
CHECK_STATUS(MYSQLI_STATUS_VALID); CHECK_STATUS(MYSQLI_STATUS_VALID);
rc = mysql_affected_rows(mysql->mysql); rc = (long) mysql_affected_rows(mysql->mysql);
if (rc == (my_ulonglong)-1) { if (rc == (long)-1) {
ZVAL_LONG(*retval, -1); ZVAL_LONG(*retval, -1);
return SUCCESS; return SUCCESS;
} }
@ -279,7 +279,7 @@ static int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC)
static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{ {
MY_STMT *p; MY_STMT *p;
my_ulonglong rc; long rc;
MAKE_STD_ZVAL(*retval); MAKE_STD_ZVAL(*retval);
CHECK_STATUS(MYSQLI_STATUS_VALID); CHECK_STATUS(MYSQLI_STATUS_VALID);
@ -289,9 +289,9 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
if (!p) { if (!p) {
ZVAL_NULL(*retval); ZVAL_NULL(*retval);
} else { } else {
rc = mysql_stmt_affected_rows(p->stmt); rc = (long) mysql_stmt_affected_rows(p->stmt);
if (rc == (my_ulonglong)-1) { if (rc == (long)-1) {
ZVAL_LONG(*retval, -1); ZVAL_LONG(*retval, -1);
return SUCCESS; return SUCCESS;
} }
@ -300,7 +300,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
ZVAL_LONG(*retval, rc); ZVAL_LONG(*retval, rc);
} else { } else {
char *ret; char *ret;
int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc); int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_longlong) rc);
ZVAL_STRINGL(*retval, ret, l, 0); ZVAL_STRINGL(*retval, ret, l, 0);
} }
} }

28
ext/pdo_mysql/mysql_statement.c
View file

@ -122,10 +122,10 @@ static int pdo_mysql_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
static void pdo_mysql_stmt_set_row_count(pdo_stmt_t *stmt) /* {{{ */ static void pdo_mysql_stmt_set_row_count(pdo_stmt_t *stmt) /* {{{ */
{ {
my_ulonglong row_count; long row_count;
pdo_mysql_stmt *S = stmt->driver_data; pdo_mysql_stmt *S = stmt->driver_data;
row_count = mysql_stmt_affected_rows(S->stmt); row_count = (long) mysql_stmt_affected_rows(S->stmt);
if (row_count != (my_ulonglong)-1) { if (row_count != (long)-1) {
stmt->row_count = row_count; stmt->row_count = row_count;
} }
} }
@ -248,7 +248,7 @@ static int pdo_mysql_stmt_execute_prepared_mysqlnd(pdo_stmt_t *stmt TSRMLS_DC) /
{ {
pdo_mysql_stmt *S = stmt->driver_data; pdo_mysql_stmt *S = stmt->driver_data;
pdo_mysql_db_handle *H = S->H; pdo_mysql_db_handle *H = S->H;
unsigned int i; int i;
PDO_DBG_ENTER("pdo_mysql_stmt_execute_prepared_mysqlnd"); PDO_DBG_ENTER("pdo_mysql_stmt_execute_prepared_mysqlnd");
@ -325,13 +325,13 @@ static int pdo_mysql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
PDO_DBG_RETURN(0); PDO_DBG_RETURN(0);
} }
stmt->row_count = mysql_num_rows(S->result); stmt->row_count = (long) mysql_num_rows(S->result);
stmt->column_count = (int) mysql_num_fields(S->result); stmt->column_count = (int) mysql_num_fields(S->result);
S->fields = mysql_fetch_fields(S->result); S->fields = mysql_fetch_fields(S->result);
} else { } else {
/* this was a DML or DDL query (INSERT, UPDATE, DELETE, ... */ /* this was a DML or DDL query (INSERT, UPDATE, DELETE, ... */
stmt->row_count = row_count; stmt->row_count = (long) row_count;
} }
PDO_DBG_RETURN(1); PDO_DBG_RETURN(1);
@ -343,7 +343,7 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
#if HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND #if HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
pdo_mysql_db_handle *H = S->H; pdo_mysql_db_handle *H = S->H;
my_ulonglong row_count; long row_count;
int ret; int ret;
PDO_DBG_ENTER("pdo_mysql_stmt_next_rowset"); PDO_DBG_ENTER("pdo_mysql_stmt_next_rowset");
PDO_DBG_INF_FMT("stmt=%p", S->stmt); PDO_DBG_INF_FMT("stmt=%p", S->stmt);
@ -374,7 +374,7 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
} }
{ {
/* for SHOW/DESCRIBE and others the column/field count is not available before execute */ /* for SHOW/DESCRIBE and others the column/field count is not available before execute */
unsigned int i; int i;
stmt->column_count = S->stmt->field_count; stmt->column_count = S->stmt->field_count;
for (i = 0; i < stmt->column_count; i++) { for (i = 0; i < stmt->column_count; i++) {
@ -392,8 +392,8 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
PDO_DBG_RETURN(1); PDO_DBG_RETURN(1);
} }
} }
row_count = mysql_stmt_affected_rows(S->stmt); row_count = (long) mysql_stmt_affected_rows(S->stmt);
if (row_count != (my_ulonglong)-1) { if (row_count != (long)-1) {
stmt->row_count = row_count; stmt->row_count = row_count;
} }
PDO_DBG_RETURN(1); PDO_DBG_RETURN(1);
@ -436,7 +436,7 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
PDO_DBG_RETURN(0); PDO_DBG_RETURN(0);
} }
stmt->row_count = row_count; stmt->row_count = (long) row_count;
stmt->column_count = (int) mysql_num_fields(S->result); stmt->column_count = (int) mysql_num_fields(S->result);
S->fields = mysql_fetch_fields(S->result); S->fields = mysql_fetch_fields(S->result);
PDO_DBG_RETURN(1); PDO_DBG_RETURN(1);
@ -493,7 +493,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
PDO_DBG_RETURN(1); PDO_DBG_RETURN(1);
case PDO_PARAM_EVT_EXEC_PRE: case PDO_PARAM_EVT_EXEC_PRE:
if (S->params_given < S->num_params) { if (S->params_given < (unsigned int) S->num_params) {
/* too few parameter bound */ /* too few parameter bound */
PDO_DBG_ERR("too few parameters bound"); PDO_DBG_ERR("too few parameters bound");
strcpy(stmt->error_code, "HY093"); strcpy(stmt->error_code, "HY093");
@ -671,7 +671,7 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{
{ {
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
struct pdo_column_data *cols = stmt->columns; struct pdo_column_data *cols = stmt->columns;
unsigned int i; int i;
PDO_DBG_ENTER("pdo_mysql_stmt_describe"); PDO_DBG_ENTER("pdo_mysql_stmt_describe");
PDO_DBG_INF_FMT("stmt=%p", S->stmt); PDO_DBG_INF_FMT("stmt=%p", S->stmt);
@ -690,7 +690,7 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{
if (cols[0].name) { if (cols[0].name) {
PDO_DBG_RETURN(1); PDO_DBG_RETURN(1);
} }
for (i=0; i < stmt->column_count; i++) { for (i = 0; i < stmt->column_count; i++) {
int namelen; int namelen;
if (S->H->fetch_table_names) { if (S->H->fetch_table_names) {