diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-03-04 17:14:56 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-03-04 17:14:56 +0000 |
| commit | a8b620a91f485df5cd6a334ab7be19009acdeac0 (patch) | |
| tree | 0c7e8ea5d3975f13e73ae44a789ddf0f3e746f00 /ext | |
| parent | 802a410834d5f516a748ba69a53f44604d8f6185 (diff) | |
| download | php-git-a8b620a91f485df5cd6a334ab7be19009acdeac0.tar.gz | |
MFH: 64bit long fix
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mbstring/mbstring.c | 14 | ||||
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 5 |
2 files changed, 9 insertions, 10 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 36dbe83c4b..02b516c465 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1838,7 +1838,7 @@ PHP_FUNCTION(mb_parse_str) PHP_FUNCTION(mb_output_handler) { char *arg_string; - size_t arg_string_len; + int arg_string_len; long arg_status; mbfl_string string, result; const char *charset; @@ -2626,7 +2626,7 @@ PHP_FUNCTION(mb_convert_encoding) PHP_FUNCTION(mb_convert_case) { char *str, *from_encoding = (char*)mbfl_no2preferred_mime_name(MBSTRG(current_internal_encoding)); - long str_len, from_encoding_len; + int str_len, from_encoding_len; long case_mode = 0; char *newstr; size_t ret_len; @@ -2636,7 +2636,7 @@ PHP_FUNCTION(mb_convert_case) &case_mode, &from_encoding, &from_encoding_len) == FAILURE) RETURN_FALSE; - newstr = php_unicode_convert_case(case_mode, str, str_len, &ret_len, from_encoding TSRMLS_CC); + newstr = php_unicode_convert_case(case_mode, str, (size_t) str_len, &ret_len, from_encoding TSRMLS_CC); if (newstr) { RETVAL_STRINGL(newstr, ret_len, 0); @@ -2650,7 +2650,7 @@ PHP_FUNCTION(mb_convert_case) PHP_FUNCTION(mb_strtoupper) { char *str, *from_encoding = (char*)mbfl_no2preferred_mime_name(MBSTRG(current_internal_encoding)); - long str_len, from_encoding_len; + int str_len, from_encoding_len; char *newstr; size_t ret_len; @@ -2658,7 +2658,7 @@ PHP_FUNCTION(mb_strtoupper) &from_encoding, &from_encoding_len) == FAILURE) { RETURN_FALSE; } - newstr = php_unicode_convert_case(PHP_UNICODE_CASE_UPPER, str, str_len, &ret_len, from_encoding TSRMLS_CC); + newstr = php_unicode_convert_case(PHP_UNICODE_CASE_UPPER, str, (size_t) str_len, &ret_len, from_encoding TSRMLS_CC); if (newstr) { RETURN_STRINGL(newstr, ret_len, 0); @@ -2673,7 +2673,7 @@ PHP_FUNCTION(mb_strtoupper) PHP_FUNCTION(mb_strtolower) { char *str, *from_encoding = (char*)mbfl_no2preferred_mime_name(MBSTRG(current_internal_encoding)); - long str_len, from_encoding_len; + int str_len, from_encoding_len; char *newstr; size_t ret_len; @@ -2681,7 +2681,7 @@ PHP_FUNCTION(mb_strtolower) &from_encoding, &from_encoding_len) == FAILURE) { RETURN_FALSE; } - newstr = php_unicode_convert_case(PHP_UNICODE_CASE_LOWER, str, str_len, &ret_len, from_encoding TSRMLS_CC); + newstr = php_unicode_convert_case(PHP_UNICODE_CASE_LOWER, str, (size_t) str_len, &ret_len, from_encoding TSRMLS_CC); if (newstr) { RETURN_STRINGL(newstr, ret_len, 0); diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index b4c12142e1..0126202c53 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -595,9 +595,8 @@ PHP_FUNCTION(mb_split) mb_regex_t re; struct mbre_registers regs = {0, 0, 0, 0}; char *string; - int n, err, count, string_len, pos; - - count = -1; + int n, err, string_len, pos; + long count = -1; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|l", &arg_pat, &string, &string_len, &count) == FAILURE) { |