cvs: php-src /ext/spl spl_iterators.c

helly Thu Mar 23 22:25:46 2006 UTC Modified files: /php-src/ext/spl spl_iterators.c Log: - Fix arginfo for (Recursive)RegExIterator http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.120&r2=1.121&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.120 php-src/ext/spl/spl_iterators.c:1.121 --- php-src/ext/spl/spl_iterators.c:1.120 Mon Mar 6 22:22:07 2006 +++ php-src/ext/spl/spl_iterators.c Thu Mar 23 22:25:46 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.120 2006/03/06 22:22:07 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.121 2006/03/23 22:25:46 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1455,9 +1455,10 @@ #if HAVE_PCRE || HAVE_BUNDLED_PCRE static -ZEND_BEGIN_ARG_INFO(arginfo_regex_it___construct, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it___construct, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, regex) + ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); static zend_function_entry spl_funcs_RegExIterator[] = { @@ -1466,8 +1467,15 @@ {NULL, NULL, NULL} }; +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_rec_regex_it___construct, 0, 0, 2) + ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0) + ZEND_ARG_INFO(0, regex) + ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO(); + static zend_function_entry spl_funcs_RecursiveRegExIterator[] = { - SPL_ME(RecursiveRegExIterator, __construct, arginfo_regex_it___construct, ZEND_ACC_PUBLIC) + SPL_ME(RecursiveRegExIterator, __construct, arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC) SPL_ME(ParentIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) SPL_ME(ParentIterator, getChildren, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL}