andrey Mon, 04 Oct 2010 14:52:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304029
Log:
fix two more warnings
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-04
14:21:09 UTC (rev 304028)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-04
14:52:14 UTC (rev 304029)
@@ -49,7 +49,7 @@
if (!data_cursor || row_count == result->stored_data->initialized_rows)
{
DBG_RETURN(ret);
}
- while ((data_cursor - data_begin) < (row_count * field_count)) {
+ while ((data_cursor - data_begin) < (int)(row_count * field_count)) {
if (NULL == data_cursor[0]) {
enum_func_status rc = result->m.row_decoder(
result->stored_data->row_buffers[(data_cursor - data_begin) / field_count],
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-10-04 14:21:09 UTC (rev 304028)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-10-04 14:52:14 UTC (rev 304029)
@@ -243,7 +243,7 @@
}
}
if ((buf_len - (p - buf)) > 0) {
- error_msg_len = MIN((buf_len - (p - buf)),
error_buf_len - 1);
+ error_msg_len = MIN((int)((buf_len - (p - buf))), (int)
(error_buf_len - 1));
memcpy(error, p, error_msg_len);
}
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-10-04 14:21:09 UTC
(rev 304028)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-10-04 14:52:14 UTC
(rev 304029)
@@ -49,7 +49,7 @@
if (!data_cursor || row_count == result->stored_data->initialized_rows)
{
DBG_RETURN(ret);
}
- while ((data_cursor - data_begin) < (row_count * field_count)) {
+ while ((data_cursor - data_begin) < (int)(row_count * field_count)) {
if (NULL == data_cursor[0]) {
enum_func_status rc = result->m.row_decoder(
result->stored_data->row_buffers[(data_cursor - data_begin) / field_count],
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-10-04
14:21:09 UTC (rev 304028)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-10-04
14:52:14 UTC (rev 304029)
@@ -243,7 +243,7 @@
}
}
if ((buf_len - (p - buf)) > 0) {
- error_msg_len = MIN((buf_len - (p - buf)),
error_buf_len - 1);
+ error_msg_len = MIN((int)((buf_len - (p - buf))), (int)
(error_buf_len - 1));
memcpy(error, p, error_msg_len);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
