[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c

[Andrey Hristov]

andrey                                   Tue, 05 Oct 2010 17:10:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=304115

Log:
two more compiler warnings fixed - size does matter

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result.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-05 
17:03:50 UTC (rev 304114)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2010-10-05 
17:10:47 UTC (rev 304115)
@@ -42,7 +42,7 @@
        zval **data_cursor = result->stored_data? 
result->stored_data->data:NULL;
        zval **data_begin = result->stored_data? result->stored_data->data:NULL;
        unsigned int field_count = result->meta? result->meta->field_count : 0;
-       unsigned int row_count = result->stored_data? 
result->stored_data->row_count:0;
+       uint64_t row_count = result->stored_data? 
result->stored_data->row_count:0;
        enum_func_status ret = PASS;
        DBG_ENTER("mysqlnd_res::initialize_result_set_rest");

@@ -208,10 +208,10 @@
                for (row = set->row_count - 1; row >= 0; row--) {
                        zval **current_row = set->data + row * field_count;
                        MYSQLND_MEMORY_POOL_CHUNK *current_buffer = 
set->row_buffers[row];
-                       int col;
+                       int64_t col;

                        if (current_row != NULL) {
-                               for (col = (int64_t) field_count - 1; col >= 0; 
--col) {
+                               for (col = field_count - 1; col >= 0; --col) {
                                        if (current_row[col]) {
                                                zend_bool copy_ctor_called;
                                                
mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), result->type, 
&copy_ctor_called TSRMLS_CC);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2010-10-05 17:03:50 UTC 
(rev 304114)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2010-10-05 17:10:47 UTC 
(rev 304115)
@@ -42,7 +42,7 @@
        zval **data_cursor = result->stored_data? 
result->stored_data->data:NULL;
        zval **data_begin = result->stored_data? result->stored_data->data:NULL;
        unsigned int field_count = result->meta? result->meta->field_count : 0;
-       unsigned int row_count = result->stored_data? 
result->stored_data->row_count:0;
+       uint64_t row_count = result->stored_data? 
result->stored_data->row_count:0;
        enum_func_status ret = PASS;
        DBG_ENTER("mysqlnd_res::initialize_result_set_rest");

@@ -208,10 +208,10 @@
                for (row = set->row_count - 1; row >= 0; row--) {
                        zval **current_row = set->data + row * field_count;
                        MYSQLND_MEMORY_POOL_CHUNK *current_buffer = 
set->row_buffers[row];
-                       int col;
+                       int64_t col;

                        if (current_row != NULL) {
-                               for (col = (int64_t) field_count - 1; col >= 0; 
--col) {
+                               for (col = field_count - 1; col >= 0; --col) {
                                        if (current_row[col]) {
                                                zend_bool copy_ctor_called;
                                                
mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), result->type, 
&copy_ctor_called TSRMLS_CC);


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php