summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-09-15 18:14:37 +0200
committerAnatol Belski <ab@php.net>2014-09-15 19:46:33 +0200
commit8b2f15551d5095ea364f18b857ff8739a368e64a (patch)
tree1ffc7194a116e9329da9233acb1c5614dd078231
parent066d39020bc15ae418bc309e791c7788708d9e60 (diff)
downloadphp-git-8b2f15551d5095ea364f18b857ff8739a368e64a.tar.gz
fix signed/unsigned mismatch warnings
-rw-r--r--ext/iconv/iconv.c6
1 files changed, 3 insertions, 3 deletions
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;
}