From: Anatol Belski Date: Mon, 15 Sep 2014 16:14:37 +0000 (+0200) Subject: fix signed/unsigned mismatch warnings X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~85^2~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b2f15551d5095ea364f18b857ff8739a368e64a;p=php fix signed/unsigned mismatch warnings --- diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 19270a55b9..ac2374c6a3 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -824,16 +824,16 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval, } } - if(len > total_len) { + if(len > (zend_long)total_len) { len = total_len; } - if (offset >= total_len) { + if (offset >= (zend_long)total_len) { return PHP_ICONV_ERR_SUCCESS; } - if ((offset + len) > total_len ) { + if ((offset + len) > (zend_long)total_len ) { /* trying to compute the length */ len = total_len - offset; }