summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2010-10-04 14:52:14 +0000
committerAndrey Hristov <andrey@php.net>2010-10-04 14:52:14 +0000
commita4ad1114543e175c7a802d00ccfc3326ad5acd3e (patch)
tree57294ef939a36c5cc318d5fc125069b5cf7e6b81
parent9f73a4e045e9dfefad8b7f62ff6307ee70be5c4e (diff)
downloadphp-git-a4ad1114543e175c7a802d00ccfc3326ad5acd3e.tar.gz
fix two more warnings
-rw-r--r--ext/mysqlnd/mysqlnd_result.c2
-rw-r--r--ext/mysqlnd/mysqlnd_wireprotocol.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index f1a2047227..94a8a487cc 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -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],
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 9da29a9148..882e6c6ea2 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -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);
}
}