cvs: php4 /ext/mbstring mbstring.c
| From: | Rui Hirokawa | Date: | Fri, 24 May 2002 22:30:25 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12095@lists.php.net to get a copy of this message | ||
hirokawa Fri May 24 18:30:25 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
reverted my patch.
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.71 php4/ext/mbstring/mbstring.c:1.72
--- php4/ext/mbstring/mbstring.c:1.71 Fri May 24 18:28:42 2002
+++ php4/ext/mbstring/mbstring.c Fri May 24 18:30:24 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.71 2002/05/24 22:28:42 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.72 2002/05/24 22:30:24 hirokawa Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -75,8 +75,6 @@
#include "mbregex.h"
#endif
-#include "mbfilter.h"
-
#if defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mbstr_default_identify_list[] = {
mbfl_no_encoding_ascii,
@@ -1540,7 +1538,7 @@
} else {
/* auto detect */
from_encoding = mbfl_no_encoding_invalid;
- identd = mbfl_encoding_detector_new((mbfl_no_encoding *)elist, elistsz TSRMLS_CC);
+ identd = mbfl_encoding_detector_new(elist, elistsz TSRMLS_CC);
if (identd != NULL) {
n = 0;
while (n < num) {
@@ -2262,7 +2260,7 @@
string.no_encoding = from_encoding;
} else if (size > 1) {
/* auto detect */
- from_encoding = mbfl_identify_encoding_no(&string, (mbfl_no_encoding *)list, size
TSRMLS_CC);
+ from_encoding = mbfl_identify_encoding_no(&string, list, size TSRMLS_CC);
if (from_encoding != mbfl_no_encoding_invalid) {
string.no_encoding = from_encoding;
} else {
@@ -2435,9 +2433,9 @@
}
if (size > 0 && list != NULL) {
- elist = (mbfl_no_encoding *)list;
+ elist = list;
} else {
- elist = (mbfl_no_encoding *)MBSTRG(current_detect_order_list);
+ elist = MBSTRG(current_detect_order_list);
size = MBSTRG(current_detect_order_list_size);
}
@@ -2744,7 +2742,7 @@
stack = (pval ***)emalloc(stack_max*sizeof(pval **));
if (stack != NULL) {
stack_level = 0;
- identd = mbfl_encoding_detector_new((mbfl_no_encoding *)elist, elistsz TSRMLS_CC);
+ identd = mbfl_encoding_detector_new(elist, elistsz TSRMLS_CC);
if (identd != NULL) {
n = 2;
while (n < argc || stack_level > 0) {
@@ -3067,7 +3065,7 @@
orig_str.no_language = MBSTRG(current_language);
orig_str.val = Z_STRVAL_PP(argv[1]);
orig_str.len = Z_STRLEN_PP(argv[1]);
- orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str, (mbfl_no_encoding
*)MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
+ orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
if(orig_str.no_encoding == mbfl_no_encoding_invalid) {
orig_str.no_encoding = MBSTRG(current_internal_encoding);
}
@@ -3089,7 +3087,7 @@
orig_str.no_language = MBSTRG(current_language);
orig_str.val = Z_STRVAL_PP(argv[2]);
orig_str.len = Z_STRLEN_PP(argv[2]);
- orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str, (mbfl_no_encoding
*)MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
+ orig_str.no_encoding = mbfl_identify_encoding_no(&orig_str,
MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size) TSRMLS_CC);
if(orig_str.no_encoding == mbfl_no_encoding_invalid) {
orig_str.no_encoding = MBSTRG(current_internal_encoding);
}