size_t fixes

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 4f3b7dc08e08cd9a464da05652cded092a447379..cb5fb053eab30b7df7ddbb84aca4cdd2e9006d79 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1347,7 +1347,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output)
 /* }}} */
 
 /* {{{ static _php_mb_ini_mbstring_internal_encoding_set */
-int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint32_t new_value_length)
+int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, size_t new_value_length)
 {
        const mbfl_encoding *encoding;
 
@@ -2932,7 +2932,7 @@ PHP_FUNCTION(mb_strcut)
                }
        }
 
-       if ((unsigned int)from > string.len) {
+       if (from > string.len) {
                RETURN_FALSE;
        }
 
@@ -4469,7 +4469,7 @@ PHP_FUNCTION(mb_send_mail)
        /* message body */
        orig_str.no_language = MBSTRG(language);
        orig_str.val = (unsigned char *)message;
-       orig_str.len = (unsigned int)message_len;
+       orig_str.len = message_len;
        orig_str.encoding = MBSTRG(current_internal_encoding);
 
        if (orig_str.encoding->no_encoding == mbfl_no_encoding_invalid

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 6d0407250689724b0c973d2a46fda1787ce49c88..1b8e618af54a2ad3a5fe56b09f013855d2ffc9a9 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -157,7 +157,7 @@ MBSTRING_API size_t php_mb_stripos(int mode, const char *old_haystack, size_t ol
 MBSTRING_API int php_mb_check_encoding(const char *input, size_t length, const char *enc);
 
 /* internal use only */
-int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint32_t new_value_length);
+int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, size_t new_value_length);
 
 ZEND_BEGIN_MODULE_GLOBALS(mbstring)
        char *internal_encoding_name;