indeyets Sat Jun 28 18:04:19 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c php_mbregex.h
Log:
added arginfo (fixes #45388)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.8&r2=1.224.2.22.2.25.2.9&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.8
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.9
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.8 Fri Jun 13 14:48:33 2008
+++ php-src/ext/mbstring/mbstring.c Sat Jun 28 18:04:19 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.8 2008/06/13 14:48:33 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.9 2008/06/28 18:04:19 indeyets Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -167,6 +167,26 @@
ZEND_ARG_PASS_INFO(0)
ZEND_END_ARG_INFO()
+static
+ ZEND_BEGIN_ARG_INFO_EX(mb_parse_str_arginfo, 0, 0, 1)
+ ZEND_ARG_INFO(0, encoded_string)
+ ZEND_ARG_ARRAY_INFO(1, result, 1)
+ ZEND_END_ARG_INFO()
+
+static
+ ZEND_BEGIN_ARG_INFO_EX(mb_convert_variables_arginfo, 1, 0, 3)
+ ZEND_ARG_INFO(0, to_encoding)
+ ZEND_ARG_INFO(0, from_encoding)
+ ZEND_ARG_INFO(1, vars)
+ ZEND_END_ARG_INFO()
+
+static
+ ZEND_BEGIN_ARG_INFO_EX(mb_ereg_arginfo, 0, 0, 2)
+ ZEND_ARG_INFO(0, pattern)
+ ZEND_ARG_INFO(0, string)
+ ZEND_ARG_INFO(1, regs)
+ ZEND_END_ARG_INFO()
+
/* {{{ mb_overload_def mb_ovld[] */
static const struct mb_overload_def mb_ovld[] = {
{MB_OVERLOAD_MAIL, "mail", "mb_send_mail", "mb_orig_mail"},
@@ -204,7 +224,7 @@
PHP_FE(mb_http_output, NULL)
PHP_FE(mb_detect_order, NULL)
PHP_FE(mb_substitute_character, NULL)
- PHP_FE(mb_parse_str, second_arg_force_ref)
+ PHP_FE(mb_parse_str, mb_parse_str_arginfo)
PHP_FE(mb_output_handler, NULL)
PHP_FE(mb_preferred_mime_name, NULL)
PHP_FE(mb_strlen, NULL)
@@ -227,7 +247,7 @@
PHP_FE(mb_convert_kana, NULL)
PHP_FE(mb_encode_mimeheader, NULL)
PHP_FE(mb_decode_mimeheader, NULL)
- PHP_FE(mb_convert_variables, third_and_rest_force_ref)
+ PHP_FE(mb_convert_variables, mb_convert_variables_arginfo)
PHP_FE(mb_encode_numericentity, NULL)
PHP_FE(mb_decode_numericentity, NULL)
PHP_FE(mb_send_mail, NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.h?r1=1.12.2.1.2.1.2.1&r2=1.12.2.1.2.1.2.2&diff_format=u
Index: php-src/ext/mbstring/php_mbregex.h
diff -u php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.1
php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.2
--- php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.1 Mon Dec 31 07:17:09 2007
+++ php-src/ext/mbstring/php_mbregex.h Sat Jun 28 18:04:19 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.1 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.2 2008/06/28 18:04:19 indeyets Exp $ */
#ifndef _PHP_MBREGEX_H
#define _PHP_MBREGEX_H
@@ -45,8 +45,8 @@
#define PHP_MBREGEX_FUNCTION_ENTRIES \
PHP_FE(mb_regex_encoding, NULL) \
PHP_FE(mb_regex_set_options, NULL) \
- PHP_FE(mb_ereg, third_arg_force_ref) \
- PHP_FE(mb_eregi, third_arg_force_ref) \
+ PHP_FE(mb_ereg, mb_ereg_arginfo) \
+ PHP_FE(mb_eregi, mb_ereg_arginfo) \
PHP_FE(mb_ereg_replace, NULL) \
PHP_FE(mb_eregi_replace, NULL) \
PHP_FE(mb_split, NULL) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
