clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix two more warnings

Browse Source
This commit is contained in:
Andrey Hristov 2010-10-04 14:52:14 +00:00
parent 0a5c631488
commit 026da7d4a0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mysqlnd/mysqlnd_result.c
View 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) { if (!data_cursor || row_count == result->stored_data->initialized_rows) {
DBG_RETURN(ret); 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]) { if (NULL == data_cursor[0]) {
enum_func_status rc = result->m.row_decoder( enum_func_status rc = result->m.row_decoder(
result->stored_data->row_buffers[(data_cursor - data_begin) / field_count], result->stored_data->row_buffers[(data_cursor - data_begin) / field_count],

2
ext/mysqlnd/mysqlnd_wireprotocol.c
View File

@ -243,7 +243,7 @@ php_mysqlnd_read_error_from_line(zend_uchar *buf, size_t buf_len,
} }
} }
if ((buf_len - (p - buf)) > 0) { 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); memcpy(error, p, error_msg_len);
} }
} }