moriyoshi Tue Mar 4 12:14:57 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/mbstring mbstring.c php_mbregex.c Log: MFH: 64bit long fix Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.142.2.8 php4/ext/mbstring/mbstring.c:1.142.2.9 --- php4/ext/mbstring/mbstring.c:1.142.2.8 Thu Feb 20 12:54:10 2003 +++ php4/ext/mbstring/mbstring.c Tue Mar 4 12:14:55 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.142.2.8 2003/02/20 17:54:10 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.142.2.9 2003/03/04 17:14:55 moriyoshi Exp $ */ /* * PHP4 Multibyte String module "mbstring" @@ -1838,7 +1838,7 @@ 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_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 @@ &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_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 @@ &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_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 @@ &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); Index: php4/ext/mbstring/php_mbregex.c diff -u php4/ext/mbstring/php_mbregex.c:1.18.2.4 php4/ext/mbstring/php_mbregex.c:1.18.2.5 --- php4/ext/mbstring/php_mbregex.c:1.18.2.4 Tue Jan 21 17:09:55 2003 +++ php4/ext/mbstring/php_mbregex.c Tue Mar 4 12:14:56 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mbregex.c,v 1.18.2.4 2003/01/21 22:09:55 moriyoshi Exp $ */ +/* $Id: php_mbregex.c,v 1.18.2.5 2003/03/04 17:14:56 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -595,9 +595,8 @@ 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) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php