From: Andrey Hristov <andrey@php.net>
Date: Mon, 4 Oct 2010 14:52:14 +0000 (+0000)
Subject: fix two more warnings
X-Git-Tag: php-5.4.0alpha1~191^2~849
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=026da7d4a081a143a6dc905c71a1a386c9ae503e;p=php

fix two more warnings
---

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index b9868c8a5f..87145b7b59 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 5ee6d8c11f..3c7f1b8e56 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);
 		}
 	}