andrey Thu, 15 Apr 2010 15:28:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298042
Log:
Fix some int/uint comparison warnings
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-04-15 15:22:56 UTC
(rev 298041)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-04-15 15:28:00 UTC
(rev 298042)
@@ -720,7 +720,7 @@
}
#endif
if (conn->options.init_commands) {
- int current_command = 0;
+ unsigned int current_command = 0;
for (; current_command < conn->options.num_commands;
++current_command) {
const char * const command =
conn->options.init_commands[current_command];
MYSQLND_INC_CONN_STATISTIC(conn->stats,
STAT_INIT_COMMAND_EXECUTED_COUNT);
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-04-15
15:22:56 UTC (rev 298041)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-04-15
15:28:00 UTC (rev 298042)
@@ -646,7 +646,7 @@
for (i = 0; i < field_count; i++, field++,
zend_hash_key++) {
zval *data = result->unbuf->last_row_data[i];
- int len;
+ unsigned int len;
if (Z_TYPE_P(data) != IS_NULL) {
convert_to_string(data);
@@ -755,7 +755,7 @@
for (i = 0; i < field_count; i++, field++,
zend_hash_key++) {
zval *data = result->unbuf->last_row_data[i];
- int len = (Z_TYPE_P(data) == IS_NULL)?
0:Z_STRLEN_P(data);
+ unsigned int len = (Z_TYPE_P(data) == IS_NULL)?
0:Z_STRLEN_P(data);
if (lengths) {
lengths[i] = len;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-04-15 15:22:56 UTC (rev
298041)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-04-15 15:28:00 UTC (rev
298042)
@@ -720,7 +720,7 @@
}
#endif
if (conn->options.init_commands) {
- int current_command = 0;
+ unsigned int current_command = 0;
for (; current_command < conn->options.num_commands;
++current_command) {
const char * const command =
conn->options.init_commands[current_command];
MYSQLND_INC_CONN_STATISTIC(conn->stats,
STAT_INIT_COMMAND_EXECUTED_COUNT);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-04-15 15:22:56 UTC
(rev 298041)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-04-15 15:28:00 UTC
(rev 298042)
@@ -646,7 +646,7 @@
for (i = 0; i < field_count; i++, field++,
zend_hash_key++) {
zval *data = result->unbuf->last_row_data[i];
- int len;
+ unsigned int len;
if (Z_TYPE_P(data) != IS_NULL) {
convert_to_string(data);
@@ -755,7 +755,7 @@
for (i = 0; i < field_count; i++, field++,
zend_hash_key++) {
zval *data = result->unbuf->last_row_data[i];
- int len = (Z_TYPE_P(data) == IS_NULL)?
0:Z_STRLEN_P(data);
+ unsigned int len = (Z_TYPE_P(data) == IS_NULL)?
0:Z_STRLEN_P(data);
if (lengths) {
lengths[i] = len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
