moriyoshi Tue Mar 4 12:10:30 2003 EDT
Modified files:
/php4/ext/mbstring mbstring.c php_mbregex.c
Log:
64bit long fix: patch by Dave Hill
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.165 php4/ext/mbstring/mbstring.c:1.166
--- php4/ext/mbstring/mbstring.c:1.165 Thu Feb 20 12:52:42 2003
+++ php4/ext/mbstring/mbstring.c Tue Mar 4 12:10:29 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.165 2003/02/20 17:52:42 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.166 2003/03/04 17:10:29 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -1293,7 +1293,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;
@@ -2014,7 +2014,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;
@@ -2024,7 +2024,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);
@@ -2038,7 +2038,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;
@@ -2046,7 +2046,7 @@
&from_encoding, &from_encoding_len) == FAILURE) {
return;
}
- 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);
@@ -2061,7 +2061,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;
@@ -2069,7 +2069,7 @@
&from_encoding, &from_encoding_len) == FAILURE) {
return;
}
- 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.32 php4/ext/mbstring/php_mbregex.c:1.33
--- php4/ext/mbstring/php_mbregex.c:1.32 Thu Jan 23 15:38:44 2003
+++ php4/ext/mbstring/php_mbregex.c Tue Mar 4 12:10:29 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.32 2003/01/23 20:38:44 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.33 2003/03/04 17:10:29 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -694,9 +694,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
