MFB: string length -> int

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index a7185d1e1097adac19d7c80270e25c4ff766e633..eafd004ff169b05c6392ee810e1053a91b961863 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2099,8 +2099,8 @@ PHP_FUNCTION(mb_substr)
 {
        size_t argc = ZEND_NUM_ARGS();
        char *str, *encoding;
-       long str_len, from, len, encoding_len;
-       int mblen;
+       long from, len;
+       int mblen, str_len, encoding_len;
        mbfl_string string, result, *ret;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|ls", &str, &str_len, &from, &len, &encoding, &encoding_len) == FAILURE) {
@@ -2172,7 +2172,8 @@ PHP_FUNCTION(mb_strcut)
 {
        size_t argc = ZEND_NUM_ARGS();
        char *str, *encoding;
-       long str_len, from, len, encoding_len;
+       long from, len;
+       int str_len, encoding_len;
        mbfl_string string, result, *ret;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|ls", &str, &str_len, &from, &len, &encoding, &encoding_len) == FAILURE) {
@@ -2276,7 +2277,8 @@ PHP_FUNCTION(mb_strimwidth)
 {
        zval **arg1, **arg2, **arg3, **arg4, **arg5;
        char *str, *trimmarker, *encoding;
-       long str_len, from, width, trimmarker_len, encoding_len;
+       long from, width;
+       int str_len, trimmarker_len, encoding_len;
        mbfl_string string, result, marker, *ret;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll|ss", &str, &str_len, &from, &width, &trimmarker, &trimmarker_len, &encoding, &encoding_len) == FAILURE) {
@@ -2419,7 +2421,7 @@ MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char *_t
 PHP_FUNCTION(mb_convert_encoding)
 {
        char *arg_str, *arg_new;
-       long str_len, new_len;
+       int str_len, new_len;
        zval *arg_old;
        int i;
        size_t size, l, n;
@@ -2562,7 +2564,7 @@ PHP_FUNCTION(mb_strtolower)
 PHP_FUNCTION(mb_detect_encoding)
 {
        char *str;
-       long str_len;
+       int str_len;
        zend_bool strict=0;
        zval *encoding_list;
 
@@ -3202,7 +3204,7 @@ static void
 php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
 {
        char *str, *encoding;
-       long str_len, encoding_len;
+       int str_len, encoding_len;
        zval *zconvmap, **hash_entry;
        HashTable *target_hash;
        size_t argc = ZEND_NUM_ARGS();