com php-src: fix signed/unsigned mismatch warnings: ext/iconv/iconv.c
| From: | Anatol Belski | Date: | Mon, 15 Sep 2014 17:46:33 +0000 |
| Subject: | com php-src: fix signed/unsigned mismatch warnings: ext/iconv/iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81662@lists.php.net to get a copy of this message | ||
Commit: 8b2f15551d5095ea364f18b857ff8739a368e64a
Author: Anatol Belski <ab@php.net> Mon, 15 Sep 2014 18:14:37 +0200
Parents: 066d39020bc15ae418bc309e791c7788708d9e60
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b2f15551d5095ea364f18b857ff8739a368e64a
Log:
fix signed/unsigned mismatch warnings
Changed paths:
M ext/iconv/iconv.c
Diff:
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 19270a5..ac2374c 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;
}