kalle Wed May 20 08:30:12 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli_api.c mysqli_prop.c /php-src/ext/pdo_mysql mysql_statement.c Log: MFH: Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.36&r2=1.213.2.6.2.16.2.37&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.37 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36 Wed Mar 25 10:27:38 2009 +++ php-src/ext/mysql/php_mysql.c Wed May 20 08:30:12 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.36 2009/03/25 10:27:38 johannes Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.37 2009/05/20 08:30:12 kalle Exp $ */ /* TODO: * @@ -1166,7 +1166,7 @@ } 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)); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.24&r2=1.118.2.22.2.16.2.25&diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.24 php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.25 --- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.24 Thu Jan 22 21:01:56 2009 +++ php-src/ext/mysqli/mysqli_api.c Wed May 20 08:30:12 2009 @@ -17,7 +17,7 @@ | Ulf Wendel <u...@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.118.2.22.2.16.2.24 2009/01/22 21:01:56 johannes Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.25 2009/05/20 08:30:12 kalle Exp $ */ #ifdef HAVE_CONFIG_H @@ -158,7 +158,7 @@ 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) { - int i; + unsigned int i; MYSQLND_PARAM_BIND *params; enum_func_status ret = FAIL; @@ -1074,7 +1074,7 @@ 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"); RETURN_FALSE; } @@ -2081,7 +2081,7 @@ return; } 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)); } /* }}} */ @@ -2354,7 +2354,7 @@ } 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)); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.23.2.5.2.2.2.11&r2=1.23.2.5.2.2.2.12&diff_format=u Index: php-src/ext/mysqli/mysqli_prop.c diff -u php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.11 php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.12 --- php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.11 Mon Jan 12 12:56:01 2009 +++ php-src/ext/mysqli/mysqli_prop.c Wed May 20 08:30:12 2009 @@ -15,7 +15,7 @@ | Author: Georg Richter <ge...@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.11 2009/01/12 12:56:01 johannes Exp $ + $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.12 2009/05/20 08:30:12 kalle Exp $ */ #ifdef HAVE_CONFIG_H @@ -83,7 +83,7 @@ } else {\ l = (__ret_type)__int_func(p);\ if (l < LONG_MAX) {\ - ZVAL_LONG(*retval, l);\ + ZVAL_LONG(*retval, (long) l);\ } else { \ char *ret; \ int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \ @@ -156,7 +156,7 @@ static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) { MY_MYSQL *mysql; - my_ulonglong rc; + long rc; MAKE_STD_ZVAL(*retval); @@ -169,9 +169,9 @@ } else { 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); return SUCCESS; } @@ -277,7 +277,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) { MY_STMT *p; - my_ulonglong rc; + long rc; MAKE_STD_ZVAL(*retval); CHECK_STATUS(MYSQLI_STATUS_VALID); @@ -287,9 +287,9 @@ if (!p) { ZVAL_NULL(*retval); } 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); return SUCCESS; } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48.2.14.2.6.2.4&r2=1.48.2.14.2.6.2.5&diff_format=u Index: php-src/ext/pdo_mysql/mysql_statement.c diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.14.2.6.2.4 php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.14.2.6.2.5 --- php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.14.2.6.2.4 Wed Jan 14 19:16:24 2009 +++ php-src/ext/pdo_mysql/mysql_statement.c Wed May 20 08:30:12 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql_statement.c,v 1.48.2.14.2.6.2.4 2009/01/14 19:16:24 iliaa Exp $ */ +/* $Id: mysql_statement.c,v 1.48.2.14.2.6.2.5 2009/05/20 08:30:12 kalle Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -122,10 +122,10 @@ 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; - row_count = mysql_stmt_affected_rows(S->stmt); - if (row_count != (my_ulonglong)-1) { + row_count = (long) mysql_stmt_affected_rows(S->stmt); + if (row_count != (long)-1) { stmt->row_count = row_count; } } @@ -248,7 +248,7 @@ { pdo_mysql_stmt *S = stmt->driver_data; pdo_mysql_db_handle *H = S->H; - unsigned int i; + int i; PDO_DBG_ENTER("pdo_mysql_stmt_execute_prepared_mysqlnd"); @@ -325,13 +325,13 @@ 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); S->fields = mysql_fetch_fields(S->result); } else { /* 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); @@ -343,7 +343,7 @@ #if HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; pdo_mysql_db_handle *H = S->H; - my_ulonglong row_count; + long row_count; int ret; PDO_DBG_ENTER("pdo_mysql_stmt_next_rowset"); PDO_DBG_INF_FMT("stmt=%p", S->stmt); @@ -374,7 +374,7 @@ } { /* 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; for (i = 0; i < stmt->column_count; i++) { @@ -388,12 +388,13 @@ /* if buffered, pre-fetch all the data */ if (H->buffered) { - if (mysql_stmt_store_result(S->stmt)) + if (mysql_stmt_store_result(S->stmt)) { PDO_DBG_RETURN(1); + } } } - row_count = mysql_stmt_affected_rows(S->stmt); - if (row_count != (my_ulonglong)-1) { + row_count = (long) mysql_stmt_affected_rows(S->stmt); + if (row_count != (long)-1) { stmt->row_count = row_count; } PDO_DBG_RETURN(1); @@ -426,7 +427,7 @@ row_count = 0; } else { S->result = mysql_store_result(H->server); - if ((my_ulonglong)-1 == (row_count = mysql_affected_rows(H->server))) { + if ((long)-1 == (row_count = (long) mysql_affected_rows(H->server))) { pdo_mysql_error_stmt(stmt); PDO_DBG_RETURN(0); } @@ -493,7 +494,7 @@ PDO_DBG_RETURN(1); 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 */ PDO_DBG_ERR("too few parameters bound"); strcpy(stmt->error_code, "HY093"); @@ -671,7 +672,7 @@ { pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; struct pdo_column_data *cols = stmt->columns; - unsigned int i; + int i; PDO_DBG_ENTER("pdo_mysql_stmt_describe"); PDO_DBG_INF_FMT("stmt=%p", S->stmt); @@ -690,7 +691,7 @@ if (cols[0].name) { PDO_DBG_RETURN(1); } - for (i=0; i < stmt->column_count; i++) { + for (i = 0; i < stmt->column_count; i++) { int namelen; if (S->H->fetch_table_names) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php