masugata Thu Aug 24 16:52:36 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
added returned value in mb_get_info( ).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.9&r2=1.224.2.22.2.10&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.9
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.10
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.9 Mon Jul 17 04:48:17 2006
+++ php-src/ext/mbstring/mbstring.c Thu Aug 24 16:52:36 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.9 2006/07/17 04:48:17 masugata Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.10 2006/08/24 16:52:36 masugata Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3841,6 +3841,7 @@
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding))) != NULL) {
add_assoc_string(return_value, "http_output", name, 1);
}
+ add_assoc_long(return_value, "func_overload",
MBSTRG(func_overload));
if (MBSTRG(func_overload)){
over_func = &(mb_ovld[0]);
MAKE_STD_ZVAL(row1);
@@ -3851,9 +3852,9 @@
}
over_func++;
}
- add_assoc_zval(return_value, "func_overload", row1);
+ add_assoc_zval(return_value, "func_overload_list",
row1);
} else {
- add_assoc_string(return_value, "func_overload", "no
overload", 1);
+ add_assoc_string(return_value, "func_overload_list",
"no overload", 1);
}
if (lang != NULL) {
if ((name = (char
*)mbfl_no_encoding2name(lang->mail_charset)) != NULL) {
@@ -3930,6 +3931,8 @@
RETVAL_STRING(name, 1);
}
} else if (!strcasecmp("func_overload", typ)) {
+ RETVAL_LONG(MBSTRG(func_overload));
+ } else if (!strcasecmp("func_overload_list", typ)) {
if (MBSTRG(func_overload)){
over_func = &(mb_ovld[0]);
array_init(return_value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
