com php-src: fix datatype mismatch warnings: ext/standard/uuencode.c
| From: | Anatol Belski | Date: | Wed, 22 Oct 2014 15:56:21 +0000 |
| Subject: | com php-src: fix datatype mismatch warnings: ext/standard/uuencode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82439@lists.php.net to get a copy of this message | ||
Commit: 80163b4a2b9ae8cef4c01f719aed795b9eb0a966
Author: Anatol Belski <ab@php.net> Wed, 22 Oct 2014 09:42:11 +0200
Parents: 2a7f9dcf5b254e5f8ded60a156115a405a42f882
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=80163b4a2b9ae8cef4c01f719aed795b9eb0a966
Log:
fix datatype mismatch warnings
Changed paths:
M ext/standard/uuencode.c
Diff:
diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c
index 6582e7d..c30225c 100644
--- a/ext/standard/uuencode.c
+++ b/ext/standard/uuencode.c
@@ -83,7 +83,7 @@ PHPAPI zend_string *php_uuencode(char *src, size_t src_len) /* {{{ */
ee = e;
len = ee - s;
if (len % 3) {
- ee = s + (int) (floor(len / 3) * 3);
+ ee = s + (int) (floor((double)len / 3) * 3);
}
}
*p++ = PHP_UU_ENC(len);
@@ -173,7 +173,8 @@ PHPAPI zend_string *php_uudecode(char *src, size_t src_len) /* {{{ */
s++;
}
- if ((len = total_len > (p - dest->val))) {
+ assert(p > dest->val);
+ if ((len = total_len > (size_t)(p - dest->val))) {
*p++ = PHP_UU_DEC(*s) << 2 | PHP_UU_DEC(*(s + 1)) >> 4;
if (len > 1) {
*p++ = PHP_UU_DEC(*(s + 1)) << 4 | PHP_UU_DEC(*(s + 2)) >> 2;