php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

MFH: 64bit long fix

Browse Source
This commit is contained in:
Moriyoshi Koizumi
2003-03-04 17:14:56 +00:00
parent 802a410834
commit a8b620a91f
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/mbstring/mbstring.c
+7 -7
View File
@@ -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);
ext/mbstring/php_mbregex.c
+2 -3
View File
@@ -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) {