]> granicus.if.org Git - php/commitdiff
fix two more warnings
authorAndrey Hristov <andrey@php.net>
Mon, 4 Oct 2010 14:52:14 +0000 (14:52 +0000)
committerAndrey Hristov <andrey@php.net>
Mon, 4 Oct 2010 14:52:14 +0000 (14:52 +0000)
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_wireprotocol.c

index b9868c8a5f8f275ea69cc98a2936cd61af5191a0..87145b7b59637c57c4daff83dc5c69c1cee3da39 100644 (file)
@@ -49,7 +49,7 @@ MYSQLND_METHOD(mysqlnd_res, initialize_result_set_rest)(MYSQLND_RES * const resu
        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],
index 5ee6d8c11fce5fdf1966ccd8758d6d3b2e0e39a7..3c7f1b8e5648d995c7ec993f0aa53f1204d7900d 100644 (file)
@@ -243,7 +243,7 @@ php_mysqlnd_read_error_from_line(zend_uchar *buf, size_t buf_len,
                        }
                }
                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);
                }
        }