cvs: php-src(PHP_5_3) / run-tests.php /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c /ext/ctype
ctype.c /ext/curl interface.c /ext/date php_date.c /ext/dba dba.c /ext/dom attr.c cdatasection.c characterdata.c comment.c document.c
documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c domimplementationsource.c domstringlist.c
element.c entityreference.c namednodemap.c namelist.c node.c nodelist.c php_dom.c processinginstruction.c string_extend.c text.c xpath.c /ext/ereg
ereg.c /ext/exif exif.c /ext/fileinfo fileinfo.c /ext/filter filter.c /ext/ftp php_ftp.c /ext/gd gd.c /ext/gettext gettext.c /ext/gmp gmp.c
/ext/hash hash.c /ext/iconv iconv.c /ext/imap php_imap.c /ext/interbase interbase.c /ext/intl php_intl.c /ext/intl/collator collator_class.c
/ext/intl/dateformat dateformat_class.c /ext/intl/formatter formatter_class.c /ext/intl/locale locale_class.! c /ext/intl/msgformat
msgformat_class.c /ext/intl/normalizer normalizer_class.c /ext/json json.c /ext/ldap ldap.c /ext/libxml libxml.c /ext/mbstring mbstring.c
/ext/mcrypt mcrypt.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/mysqli mysqli_fe.c /ext/oci8 oci8.c /ext/odbc birdstep.c php_odbc.c
/ext/openssl openssl.c /ext/pcntl pcntl.c /ext/pcre php_pcre.c /ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt
invalid_utf8_offset.phpt locales.phpt pcre_anchored.phpt preg_replace2.phpt recursion_limit.phpt skip.ini skip_001.inc skip_002.inc skip_003.inc
/ext/pdo pdo.c pdo_stmt.c /ext/pgsql pgsql.c /ext/phar phar_object.c /ext/posix posix.c /ext/pspell pspell.c /ext/readline readline.c
/ext/recode recode.c /ext/reflection php_reflection.c /ext/session session.c /ext/shmop shmop.c /ext/simplexml simplexml.c /ext/snmp snmp.c
/ext/soap soap.c /ext/sockets sockets.c /ext/spl php_spl.c spl_array.c spl_directory.c spl_dllist.c! spl_fixedarray.c spl_heap.c spl_iterators.c
spl_observer.c /ext/sqlite sqlite.c /ext/sqlite3 sqlite3.c /ext/standard basic_functions.c user_filters.c /ext/sybase_ct php_sybase_ct.c
/ext/sysvmsg sysvmsg.c /ext/sysvsem sysvsem.c /ext/sysvshm sysvshm.c /ext/tidy tidy.c /ext/tokenizer tokenizer.c /ext/wddx wddx.c /ex

felipe Sun Nov 2 21:19:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests skip.ini skip_001.inc skip_002.inc skip_003.inc Modified files: /php-src run-tests.php /ZendEngine2 zend_API.h zend_builtin_functions.c zend_exceptions.c zend_interfaces.c /php-src/ext/bcmath bcmath.c /php-src/ext/bz2 bz2.c /php-src/ext/calendar calendar.c /php-src/ext/com_dotnet com_extension.c /php-src/ext/ctype ctype.c /php-src/ext/curl interface.c /php-src/ext/date php_date.c /php-src/ext/dba dba.c /php-src/ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c domconfiguration.c domerrorhandler.c domimplementation.c domimplementationlist.c domimplementationsource.c domstringlist.c element.c entityreference.c namednodemap.c namelist.c node.c nodelist.c php_dom.c processinginstruction.c string_extend.c text.c xpath.c /php-src/ext/ereg ereg.c /php-src/ext/exif exif.c /php-src/ext/fileinfo fileinfo.c /php-src/ext/filter filter.c /php-src/ext/ftp php_ftp.c /php-src/ext/gd gd.c /php-src/ext/gettext gettext.c /php-src/ext/gmp gmp.c /php-src/ext/hash hash.c /php-src/ext/iconv iconv.c /php-src/ext/imap php_imap.c /php-src/ext/interbase interbase.c /php-src/ext/intl php_intl.c /php-src/ext/intl/collator collator_class.c /php-src/ext/intl/dateformat dateformat_class.c /php-src/ext/intl/formatter formatter_class.c /php-src/ext/intl/locale locale_class.c /php-src/ext/intl/msgformat msgformat_class.c /php-src/ext/intl/normalizer normalizer_class.c /php-src/ext/json json.c /php-src/ext/ldap ldap.c /php-src/ext/libxml libxml.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcrypt mcrypt.c /php-src/ext/msql php_msql.c /php-src/ext/mssql php_mssql.c /php-src/ext/mysqli mysqli_fe.c /php-src/ext/oci8 oci8.c /php-src/ext/odbc birdstep.c php_odbc.c /php-src/ext/openssl openssl.c /php-src/ext/pcntl pcntl.c /php-src/ext/pcre php_pcre.c /php-src/ext/pcre/tests 007.phpt backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt invalid_utf8_offset.phpt locales.phpt pcre_anchored.phpt preg_replace2.phpt recursion_limit.phpt /php-src/ext/pdo pdo.c pdo_stmt.c /php-src/ext/pgsql pgsql.c /php-src/ext/phar phar_object.c /php-src/ext/posix posix.c /php-src/ext/pspell pspell.c /php-src/ext/readline readline.c /php-src/ext/recode recode.c /php-src/ext/reflection php_reflection.c /php-src/ext/session session.c /php-src/ext/shmop shmop.c /php-src/ext/simplexml simplexml.c /php-src/ext/snmp snmp.c /php-src/ext/soap soap.c /php-src/ext/sockets sockets.c /php-src/ext/spl php_spl.c spl_array.c spl_directory.c spl_dllist.c spl_fixedarray.c spl_heap.c spl_iterators.c spl_observer.c /php-src/ext/sqlite sqlite.c /php-src/ext/sqlite3 sqlite3.c /php-src/ext/standard basic_functions.c user_filters.c /php-src/ext/sybase_ct php_sybase_ct.c /php-src/ext/sysvmsg sysvmsg.c /php-src/ext/sysvsem sysvsem.c /php-src/ext/sysvshm sysvshm.c /php-src/ext/tidy tidy.c /php-src/ext/tokenizer tokenizer.c /php-src/ext/wddx wddx.c /php-src/ext/xml xml.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlrpc xmlrpc-epi-php.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xsl xsltprocessor.c /php-src/ext/zip php_zip.c /php-src/ext/zlib zlib.c /php-src/sapi/aolserver aolserver.c /php-src/sapi/apache php_apache.c /php-src/sapi/apache2filter php_functions.c /php-src/sapi/apache2handler php_functions.c /php-src/sapi/apache_hooks php_apache.c /php-src/sapi/milter php_milter.c /php-src/sapi/nsapi nsapi.c Log: - Revert ZEND_BEGIN_ARG_INFO change

http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.49&r2=1.226.2.37.2.35.2.50&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.49 php-src/run-tests.php:1.226.2.37.2.35.2.50 --- php-src/run-tests.php:1.226.2.37.2.35.2.49 Sun Oct 19 18:05:43 2008 +++ php-src/run-tests.php Sun Nov 2 21:19:30 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.49 2008/10/19 18:05:43 johannes Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.50 2008/11/02 21:19:30 felipe Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -612,7 +612,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.49 $' . "\n"; + echo '$Revision: 1.226.2.37.2.35.2.50 $' . "\n"; exit(1); default: @@ -814,6 +814,24 @@ find_files($dir, ($dir == 'ext')); } +function find_ini_skip($path) +{ + $skip_dir = $path; + $cwd = getcwd(); + + do { + if (in_array(basename($skip_dir), array('Zend', 'ext', '')) || $skip_dir == $cwd) { + break; + } + $ini_skip_file = $skip_dir .'/skip.ini'; + if (file_exists($ini_skip_file)) { + return $ini_skip_file; + } + } while ($skip_dir = dirname($skip_dir)); + + return false; +} + function find_files($dir, $is_ext_dir = false, $ignore = false) { global $test_files, $exts_to_test, $ignored_by_ext, $exts_skipped, $exts_tested; @@ -1385,21 +1403,56 @@ // Check if test should be skipped. $info = ''; $warn = false; - - if (array_key_exists('SKIPIF', $section_text)) { - - if (trim($section_text['SKIPIF'])) { - show_file_block('skip', $section_text['SKIPIF']); - save_text($test_skipif, $section_text['SKIPIF'], $temp_skipif); - $extra = substr(PHP_OS, 0, 3) !== "WIN" ? - "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; - - if ($leak_check) { - $env['USE_ZEND_ALLOC'] = '0'; - } else { - $env['USE_ZEND_ALLOC'] = '1'; + $skip_codes = array(); + + /* Using skip.ini */ + if ($skip_ini = find_ini_skip($file)) { + $ini = parse_ini_file($skip_ini, true); + + /* Skip on 32-bit architecture */ + if (PHP_INT_SIZE == 4 && isset($ini['SKIP_32']['test']) + && in_array(basename($file), $ini['SKIP_32']['test'])) { + show_result('SKIP', $tested, $tested_file, 'This test is for non 32-bit', $temp_filenames); + return 'SKIPPED'; + } + /* Skip on 64-bit architecture */ + if (PHP_INT_SIZE != 4 && isset($ini['SKIP_64']['test']) + && in_array(basename($file), $ini['SKIP_64']['test'])) { + show_result('SKIP', $tested, $tested_file, 'This test is for 32-bit only', $temp_filenames); + return 'SKIPPED'; + } + + $labels = array_keys($ini); + foreach ($labels as $label) { + if (in_array($label, array('SKIP_32', 'SKIP_64'))) { + continue; + } + if (isset($ini[$label]['skip']) && isset($ini[$label]['test'])) { + if (!in_array(basename($file), $ini[$label]['test'])) { + continue; + } + $code = '<?php '; + foreach ($ini[$label]['skip'] as $skip_file) { + $code .= 'require_once "'. $skip_file .'";'; + } + $skip_codes[$label] = $code; } + } + } + if (isset($section_text['SKIPIF']) && trim($section_text['SKIPIF'])) { + $skip_codes[] = $section_text['SKIPIF']; + } + + $env['USE_ZEND_ALLOC'] = $leak_check ? '0' : '1'; + $extra = substr(PHP_OS, 0, 3) !== "WIN" ? + "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; + + if (!empty($skip_codes)) { + foreach ($skip_codes as $label => $code) { + show_file_block('skip', $code); + save_text($test_skipif, $code, $temp_skipif); + $output = system_with_timeout("$extra $php $pass_options -q $ini_settings $test_skipif", $env); if (!$cfg['keep']['skip']) { @@ -1407,12 +1460,10 @@ } if (!strncasecmp('skip', ltrim($output), 4)) { - - if (preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m)) { - show_result('SKIP', $tested, $tested_file, "reason: $m[1]", $temp_filenames); - } else { - show_result('SKIP', $tested, $tested_file, '', $temp_filenames); - } + preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m); + + $reason = (is_string($label) && empty($m)) ? $label : (empty($m) ? 'not specified' : $m[1]); + show_result('SKIP', $tested, $tested_file, 'reason: '. $reason, $temp_filenames); if (isset($old_php)) { $php = $old_php; http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.207.2.8.2.8.2.19&r2=1.207.2.8.2.8.2.20&diff_format=u Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.207.2.8.2.8.2.19 ZendEngine2/zend_API.h:1.207.2.8.2.8.2.20 --- ZendEngine2/zend_API.h:1.207.2.8.2.8.2.19 Fri Oct 24 14:35:31 2008 +++ ZendEngine2/zend_API.h Sun Nov 2 21:19:30 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.207.2.8.2.8.2.19 2008/10/24 14:35:31 felipe Exp $ */ +/* $Id: zend_API.h,v 1.207.2.8.2.8.2.20 2008/11/02 21:19:30 felipe Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -101,7 +101,7 @@ #define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, sizeof(#name)-1, #classname, sizeof(#classname)-1, 0, allow_null, pass_by_ref, 0, 0 }, #define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { #name, sizeof(#name)-1, NULL, 0, 1, allow_null, pass_by_ref, 0, 0 }, #define ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, return_reference, required_num_args) \ - const static zend_arg_info name[] = { \ + const zend_arg_info name[] = { \ { NULL, 0, NULL, 0, 0, 0, pass_rest_by_reference, return_reference, required_num_args }, #define ZEND_BEGIN_ARG_INFO(name, pass_rest_by_reference) \ ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, ZEND_RETURN_VALUE, -1) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.32&r2=1.277.2.12.2.25.2.33&diff_format=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.32 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.33 --- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.32 Fri Oct 24 14:35:31 2008 +++ ZendEngine2/zend_builtin_functions.c Sun Nov 2 21:19:30 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.32 2008/10/24 14:35:31 felipe Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.33 2008/11/02 21:19:30 felipe Exp $ */ #include "zend.h" #include "zend_API.h" @@ -92,201 +92,250 @@ static ZEND_FUNCTION(gc_disable); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_zend_version, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gc_collect_cycles, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gc_enabled, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gc_enable, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gc_disable, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_func_num_args, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_func_get_arg, 0, 0, 1) ZEND_ARG_INFO(0, arg_num) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_func_get_args, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strlen, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strcmp, 0, 0, 2) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strncmp, 0, 0, 3) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_ARG_INFO(0, len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strcasecmp, 0, 0, 2) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strncasecmp, 0, 0, 3) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_ARG_INFO(0, len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_each, 0, 0, 1) ZEND_ARG_INFO(1, arr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_error_reporting, 0, 0, 1) ZEND_ARG_INFO(0, new_error_level) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_define, 0, 0, 3) ZEND_ARG_INFO(0, constant_name) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, case_insensitive) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_defined, 0, 0, 1) ZEND_ARG_INFO(0, constant_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class, 0, 0, 0) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_called_class, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_parent_class, 0, 0, 0) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_is_subclass_of, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, class_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_is_a, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, class_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_vars, 0, 0, 1) ZEND_ARG_INFO(0, class_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_object_vars, 0, 0, 1) ZEND_ARG_INFO(0, obj) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_methods, 0, 0, 1) ZEND_ARG_INFO(0, class) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_method_exists, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_property_exists, 0, 0, 2) ZEND_ARG_INFO(0, object_or_class) ZEND_ARG_INFO(0, property_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_class_exists, 0, 0, 1) ZEND_ARG_INFO(0, classname) ZEND_ARG_INFO(0, autoload) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_interface_exists, 0, 0, 1) ZEND_ARG_INFO(0, classname) ZEND_ARG_INFO(0, autoload) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_function_exists, 0, 0, 1) ZEND_ARG_INFO(0, function_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_class_alias, 0, 0, 2) ZEND_ARG_INFO(0, user_class_name) ZEND_ARG_INFO(0, alias_name) ZEND_ARG_INFO(0, autoload) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_included_files, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1) ZEND_ARG_INFO(0, messsage) ZEND_ARG_INFO(0, error_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1) ZEND_ARG_INFO(0, error_handler) ZEND_ARG_INFO(0, error_types) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_restore_error_handler, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1) ZEND_ARG_INFO(0, exception_handler) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_restore_exception_handler, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_declared_classes, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_declared_interfaces, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_defined_functions, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_defined_vars, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2) ZEND_ARG_INFO(0, args) ZEND_ARG_INFO(0, code) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_resource_type, 0, 0, 1) ZEND_ARG_INFO(0, res) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_loaded_extensions, 0, 0, 0) ZEND_ARG_INFO(0, zend_extensions) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_constants, 0, 0, 0) ZEND_ARG_INFO(0, categorize) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_debug_print_backtrace, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_backtrace, 0, 0, 0) ZEND_ARG_INFO(0, provide_object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_extension_loaded, 0, 0, 1) ZEND_ARG_INFO(0, extension_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_extension_funcs, 0, 0, 1) ZEND_ARG_INFO(0, extension_name) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.c?r1=1.79.2.6.2.9.2.15&r2=1.79.2.6.2.9.2.16&diff_format=u Index: ZendEngine2/zend_exceptions.c diff -u ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.15 ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.16 --- ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.15 Fri Oct 24 14:35:31 2008 +++ ZendEngine2/zend_exceptions.c Sun Nov 2 21:19:30 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.15 2008/10/24 14:35:31 felipe Exp $ */ +/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.16 2008/11/02 21:19:30 felipe Exp $ */ #include "zend.h" #include "zend_API.h" @@ -605,6 +605,7 @@ * And never try to change the state of exceptions and never implement anything * that gives the user anything to accomplish this. */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_exception___construct, 0, 0, 0) ZEND_ARG_INFO(0, message) ZEND_ARG_INFO(0, code) @@ -625,6 +626,7 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_error_exception___construct, 0, 0, 0) ZEND_ARG_INFO(0, message) ZEND_ARG_INFO(0, code) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_interfaces.c?r1=1.33.2.4.2.6.2.7&r2=1.33.2.4.2.6.2.8&diff_format=u Index: ZendEngine2/zend_interfaces.c diff -u ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.7 ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.8 --- ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.7 Fri Oct 24 14:35:31 2008 +++ ZendEngine2/zend_interfaces.c Sun Nov 2 21:19:30 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.7 2008/10/24 14:35:31 felipe Exp $ */ +/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.8 2008/11/02 21:19:30 felipe Exp $ */ #include "zend.h" #include "zend_API.h" @@ -498,14 +498,17 @@ const zend_function_entry *zend_funcs_traversable = NULL; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset, 0, 0, 1) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_get, 0, 0, 1) /* actually this should be return by ref but atm cannot be */ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_value, 0, 0, 2) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, value) @@ -519,6 +522,7 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0) ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/bcmath.c?r1=1.62.2.2.2.8.2.5&r2=1.62.2.2.2.8.2.6&diff_format=u Index: php-src/ext/bcmath/bcmath.c diff -u php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.5 php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.6 --- php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.5 Fri Oct 24 14:35:32 2008 +++ php-src/ext/bcmath/bcmath.c Sun Nov 2 21:19:30 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.62.2.2.2.8.2.5 2008/10/24 14:35:32 felipe Exp $ */ +/* $Id: bcmath.c,v 1.62.2.2.2.8.2.6 2008/11/02 21:19:30 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,35 +36,41 @@ static PHP_GSHUTDOWN_FUNCTION(bcmath); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bcadd, 0, 0, 2) ZEND_ARG_INFO(0, left_operand) ZEND_ARG_INFO(0, right_operand) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsub, 0, 0, 2) ZEND_ARG_INFO(0, left_operand) ZEND_ARG_INFO(0, right_operand) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bcmul, 0, 0, 2) ZEND_ARG_INFO(0, left_operand) ZEND_ARG_INFO(0, right_operand) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bcdiv, 0, 0, 2) ZEND_ARG_INFO(0, left_operand) ZEND_ARG_INFO(0, right_operand) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bcmod, 0) ZEND_ARG_INFO(0, left_operand) ZEND_ARG_INFO(0, right_operand) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpowmod, 0, 0, 3) ZEND_ARG_INFO(0, x) ZEND_ARG_INFO(0, y) @@ -72,23 +78,27 @@ ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpow, 0, 0, 2) ZEND_ARG_INFO(0, x) ZEND_ARG_INFO(0, y) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsqrt, 0, 0, 1) ZEND_ARG_INFO(0, operand) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bccomp, 0, 0, 2) ZEND_ARG_INFO(0, left_operand) ZEND_ARG_INFO(0, right_operand) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bcscale, 0) ZEND_ARG_INFO(0, scale) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.14.2.3.2.12.2.8&r2=1.14.2.3.2.12.2.9&diff_format=u Index: php-src/ext/bz2/bz2.c diff -u php-src/ext/bz2/bz2.c:1.14.2.3.2.12.2.8 php-src/ext/bz2/bz2.c:1.14.2.3.2.12.2.9 --- php-src/ext/bz2/bz2.c:1.14.2.3.2.12.2.8 Fri Oct 24 14:35:32 2008 +++ php-src/ext/bz2/bz2.c Sun Nov 2 21:19:30 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.14.2.3.2.12.2.8 2008/10/24 14:35:32 felipe Exp $ */ +/* $Id: bz2.c,v 1.14.2.3.2.12.2.9 2008/11/02 21:19:30 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -52,34 +52,41 @@ static PHP_FUNCTION(bzdecompress); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bzread, 0, 0, 1) ZEND_ARG_INFO(0, bz) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bzopen, 0) ZEND_ARG_INFO(0, file) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bzerrno, 0) ZEND_ARG_INFO(0, bz) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bzerrstr, 0) ZEND_ARG_INFO(0, bz) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bzerror, 0) ZEND_ARG_INFO(0, bz) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 2) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, blocksize) ZEND_ARG_INFO(0, workfactor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_bzdecompress, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, small) http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/calendar.c?r1=1.46.2.2.2.4.2.3&r2=1.46.2.2.2.4.2.4&diff_format=u Index: php-src/ext/calendar/calendar.c diff -u php-src/ext/calendar/calendar.c:1.46.2.2.2.4.2.3 php-src/ext/calendar/calendar.c:1.46.2.2.2.4.2.4 --- php-src/ext/calendar/calendar.c:1.46.2.2.2.4.2.3 Fri Oct 24 14:35:32 2008 +++ php-src/ext/calendar/calendar.c Sun Nov 2 21:19:30 2008 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.46.2.2.2.4.2.3 2008/10/24 14:35:32 felipe Exp $ */ +/* $Id: calendar.c,v 1.46.2.2.2.4.2.4 2008/11/02 21:19:30 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,24 +36,29 @@ #include <stdio.h> /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_unixtojd, 0, 0, 0) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_jdtounix, 0) ZEND_ARG_INFO(0, jday) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_cal_info, 0, 0, 0) ZEND_ARG_INFO(0, calendar) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_cal_days_in_month, 0) ZEND_ARG_INFO(0, calendar) ZEND_ARG_INFO(0, month) ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_cal_to_jd, 0) ZEND_ARG_INFO(0, calendar) ZEND_ARG_INFO(0, month) @@ -61,67 +66,80 @@ ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_cal_from_jd, 0) ZEND_ARG_INFO(0, jd) ZEND_ARG_INFO(0, calendar) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_jdtogregorian, 0) ZEND_ARG_INFO(0, juliandaycount) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gregoriantojd, 0) ZEND_ARG_INFO(0, month) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_jdtojulian, 0) ZEND_ARG_INFO(0, juliandaycount) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_juliantojd, 0) ZEND_ARG_INFO(0, month) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_jdtojewish, 0, 0, 1) ZEND_ARG_INFO(0, juliandaycount) ZEND_ARG_INFO(0, hebrew) ZEND_ARG_INFO(0, fl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_jewishtojd, 0) ZEND_ARG_INFO(0, month) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_jdtofrench, 0) ZEND_ARG_INFO(0, juliandaycount) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_frenchtojd, 0) ZEND_ARG_INFO(0, month) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_jddayofweek, 0, 0, 1) ZEND_ARG_INFO(0, juliandaycount) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_jdmonthname, 0) ZEND_ARG_INFO(0, juliandaycount) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_easter_date, 0, 0, 0) ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_easter_days, 0, 0, 0) ZEND_ARG_INFO(0, year) ZEND_ARG_INFO(0, method) http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.17.2.2.2.6.2.4&r2=1.17.2.2.2.6.2.5&diff_format=u Index: php-src/ext/com_dotnet/com_extension.c diff -u php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.6.2.4 php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.6.2.5 --- php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.6.2.4 Fri Oct 24 14:35:32 2008 +++ php-src/ext/com_dotnet/com_extension.c Sun Nov 2 21:19:30 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_extension.c,v 1.17.2.2.2.6.2.4 2008/10/24 14:35:32 felipe Exp $ */ +/* $Id: com_extension.c,v 1.17.2.2.2.6.2.5 2008/11/02 21:19:30 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,101 +40,122 @@ *php_com_saproxy_class_entry; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_set, 0, 0, 2) ZEND_ARG_INFO(0, variant) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_add, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_cat, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_sub, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_mul, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_and, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_div, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_eqv, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_idiv, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_imp, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_mod, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_or, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_pow, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_xor, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_abs, 0, 0, 1) ZEND_ARG_INFO(0, left) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_fix, 0, 0, 1) ZEND_ARG_INFO(0, left) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_int, 0, 0, 1) ZEND_ARG_INFO(0, left) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_neg, 0, 0, 1) ZEND_ARG_INFO(0, left) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_not, 0, 0, 1) ZEND_ARG_INFO(0, left) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_round, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, decimals) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_cmp, 0, 0, 2) ZEND_ARG_INFO(0, left) ZEND_ARG_INFO(0, right) @@ -142,52 +163,63 @@ ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_date_to_timestamp, 0, 0, 1) ZEND_ARG_INFO(0, variant) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_date_from_timestamp, 0, 0, 1) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_get_type, 0, 0, 1) ZEND_ARG_INFO(0, variant) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_set_type, 0, 0, 2) ZEND_ARG_INFO(0, variant) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_cast, 0, 0, 2) ZEND_ARG_INFO(0, variant) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_com_get_active_object, 0, 0, 1) ZEND_ARG_INFO(0, progid) ZEND_ARG_INFO(0, code_page) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_com_create_guid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_com_event_sink, 0, 0, 2) ZEND_ARG_INFO(0, comobject) ZEND_ARG_INFO(0, sinkobject) ZEND_ARG_INFO(0, sinkinterface) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_com_print_typeinfo, 0, 0, 1) ZEND_ARG_INFO(0, comobject) ZEND_ARG_INFO(0, dispinterface) ZEND_ARG_INFO(0, wantsink) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_com_message_pump, 0, 0, 0) ZEND_ARG_INFO(0, timeoutms) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_com_load_typelib, 0, 0, 1) ZEND_ARG_INFO(0, typelib_name) ZEND_ARG_INFO(0, case_insensitive) http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/ctype.c?r1=1.34.2.3.2.6.2.3&r2=1.34.2.3.2.6.2.4&diff_format=u Index: php-src/ext/ctype/ctype.c diff -u php-src/ext/ctype/ctype.c:1.34.2.3.2.6.2.3 php-src/ext/ctype/ctype.c:1.34.2.3.2.6.2.4 --- php-src/ext/ctype/ctype.c:1.34.2.3.2.6.2.3 Fri Oct 24 14:35:32 2008 +++ php-src/ext/ctype/ctype.c Sun Nov 2 21:19:30 2008 @@ -45,46 +45,57 @@ static PHP_FUNCTION(ctype_xdigit); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_alnum, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_alpha, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_cntrl, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_digit, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_lower, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_graph, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_print, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_punct, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_space, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_upper, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ctype_xdigit, 0) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.14&r2=1.62.2.14.2.27.2.15&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.14 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.15 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.14 Fri Oct 24 14:35:32 2008 +++ php-src/ext/curl/interface.c Sun Nov 2 21:19:30 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.14 2008/10/24 14:35:32 felipe Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.15 2008/11/02 21:19:30 felipe Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -189,82 +189,100 @@ } /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_version, 0, 0, 0) ZEND_ARG_INFO(0, version) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_init, 0, 0, 0) ZEND_ARG_INFO(0, url) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_copy_handle, 0) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt, 0) ZEND_ARG_INFO(0, ch) ZEND_ARG_INFO(0, option) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt_array, 0) ZEND_ARG_INFO(0, ch) ZEND_ARG_INFO(0, options)/* ARRAY_INFO(0, options, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_exec, 0) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_getinfo, 0, 0, 1) ZEND_ARG_INFO(0, ch) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_error, 0) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_errno, 0) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_close, 0) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_init, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_add_handle, 0) ZEND_ARG_INFO(0, mh) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_remove_handle, 0) ZEND_ARG_INFO(0, mh) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_select, 0, 0, 1) ZEND_ARG_INFO(0, mh) ZEND_ARG_INFO(0, timeout) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_exec, 0, 0, 1) ZEND_ARG_INFO(0, mh) ZEND_ARG_INFO(1, still_running) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_getcontent, 0) ZEND_ARG_INFO(0, ch) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_info_read, 0, 0, 1) ZEND_ARG_INFO(0, mh) ZEND_ARG_INFO(0, msgs_in_queue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0) ZEND_ARG_INFO(0, mh) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.56&r2=1.43.2.45.2.51.2.57&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.56 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.57 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.56 Fri Oct 24 14:35:33 2008 +++ php-src/ext/date/php_date.c Sun Nov 2 21:19:30 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.56 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.57 2008/11/02 21:19:30 felipe Exp $ */ #include "php.h" #include "php_streams.h" @@ -32,26 +32,31 @@ #include <time.h> /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmdate, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_idate, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strtotime, 0, 0, 1) ZEND_ARG_INFO(0, time) ZEND_ARG_INFO(0, now) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mktime, 0, 0, 0) ZEND_ARG_INFO(0, hour) ZEND_ARG_INFO(0, min) @@ -61,6 +66,7 @@ ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0) ZEND_ARG_INFO(0, hour) ZEND_ARG_INFO(0, min) @@ -70,41 +76,50 @@ ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_checkdate, 0) ZEND_ARG_INFO(0, month) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strftime, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmstrftime, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_time, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_localtime, 0, 0, 0) ZEND_ARG_INFO(0, timestamp) ZEND_ARG_INFO(0, associative_array) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_getdate, 0, 0, 0) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_default_timezone_set, 0) ZEND_ARG_INFO(0, timezone_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_default_timezone_get, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sunrise, 0, 0, 1) ZEND_ARG_INFO(0, time) ZEND_ARG_INFO(0, format) @@ -114,6 +129,7 @@ ZEND_ARG_INFO(0, gmt_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sunset, 0, 0, 1) ZEND_ARG_INFO(0, time) ZEND_ARG_INFO(0, format) @@ -123,105 +139,128 @@ ZEND_ARG_INFO(0, gmt_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_sun_info, 0) ZEND_ARG_INFO(0, time) ZEND_ARG_INFO(0, latitude) ZEND_ARG_INFO(0, longitude) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create, 0, 0, 0) ZEND_ARG_INFO(0, time) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create_from_format, 0, 0, 2) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, time) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse, 0, 0, 1) ZEND_ARG_INFO(0, date) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse_from_format, 0, 0, 2) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, date) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_get_last_errors, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_format, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_format, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_modify, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, modify) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_modify, 0, 0, 1) ZEND_ARG_INFO(0, modify) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_add, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, interval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_add, 0, 0, 1) ZEND_ARG_INFO(0, interval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sub, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, interval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_sub, 0, 0, 1) ZEND_ARG_INFO(0, interval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_get, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_method_timezone_get, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_set, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, timezone) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_timezone_set, 0, 0, 1) ZEND_ARG_INFO(0, timezone) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_offset_get, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_method_offset_get, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_diff, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, object2) ZEND_ARG_INFO(0, absolute) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_diff, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, absolute) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_time_set, 0, 0, 3) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, hour) @@ -229,12 +268,14 @@ ZEND_ARG_INFO(0, second) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_time_set, 0, 0, 2) ZEND_ARG_INFO(0, hour) ZEND_ARG_INFO(0, minute) ZEND_ARG_INFO(0, second) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_date_set, 0, 0, 4) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, year) @@ -242,12 +283,14 @@ ZEND_ARG_INFO(0, day) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_date_set, 0, 0, 3) ZEND_ARG_INFO(0, year) ZEND_ARG_INFO(0, month) ZEND_ARG_INFO(0, day) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_isodate_set, 0, 0, 3) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, year) @@ -255,96 +298,118 @@ ZEND_ARG_INFO(0, day) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_isodate_set, 0, 0, 2) ZEND_ARG_INFO(0, year) ZEND_ARG_INFO(0, week) ZEND_ARG_INFO(0, day) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timestamp_set, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, unixtimestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_timestamp_set, 0, 0, 1) ZEND_ARG_INFO(0, unixtimestamp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timestamp_get, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_method_timestamp_get, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_open, 0, 0, 1) ZEND_ARG_INFO(0, timezone) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_name_get, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_timezone_method_name_get, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_name_from_abbr, 0, 0, 1) ZEND_ARG_INFO(0, abbr) ZEND_ARG_INFO(0, gmtoffset) ZEND_ARG_INFO(0, isdst) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_offset_get, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, datetime) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_method_offset_get, 0, 0, 1) ZEND_ARG_INFO(0, datetime) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_transitions_get, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, timestamp_begin) ZEND_ARG_INFO(0, timestamp_end) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_timezone_method_transitions_get, 0) ZEND_ARG_INFO(0, timestamp_begin) ZEND_ARG_INFO(0, timestamp_end) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_location_get, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_timezone_method_location_get, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_identifiers_list, 0, 0, 0) ZEND_ARG_INFO(0, what) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_timezone_abbreviations_list, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_create_from_date_string, 0, 0, 1) ZEND_ARG_INFO(0, time) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_format, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_date_method_interval_format, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_period_construct, 0, 0, 3) ZEND_ARG_INFO(0, start) ZEND_ARG_INFO(0, interval) ZEND_ARG_INFO(0, end) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_construct, 0, 0, 0) ZEND_ARG_INFO(0, interval_spec) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.5.2.5&r2=1.111.2.4.2.5.2.6&diff_format=u Index: php-src/ext/dba/dba.c diff -u php-src/ext/dba/dba.c:1.111.2.4.2.5.2.5 php-src/ext/dba/dba.c:1.111.2.4.2.5.2.6 --- php-src/ext/dba/dba.c:1.111.2.4.2.5.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dba/dba.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.111.2.4.2.5.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: dba.c,v 1.111.2.4.2.5.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -52,6 +52,7 @@ #include "php_qdbm.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, mode) @@ -59,6 +60,7 @@ ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_open, 0, 0, 2) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, mode) @@ -66,62 +68,75 @@ ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_close, 0) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_exists, 0) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_fetch, 0, 0, 2) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, skip) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_key_split, 0) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_firstkey, 0) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_nextkey, 0) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_delete, 0) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_insert, 0) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_replace, 0) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_optimize, 0) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_sync, 0) ZEND_ARG_INFO(0, handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_handlers, 0, 0, 0) ZEND_ARG_INFO(0, full_info) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dba_list, 0) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2.2.2.2.7&r2=1.18.2.2.2.2.2.8&diff_format=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.18.2.2.2.2.2.7 php-src/ext/dom/attr.c:1.18.2.2.2.2.2.8 --- php-src/ext/dom/attr.c:1.18.2.2.2.2.2.7 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/attr.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.18.2.2.2.2.2.7 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: attr.c,v 1.18.2.2.2.2.2.8 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,9 +30,11 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_construct, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.1.2.7&r2=1.11.2.1.2.1.2.8&diff_format=u Index: php-src/ext/dom/cdatasection.c diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.7 php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.8 --- php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.7 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/cdatasection.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.7 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.8 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,6 +29,7 @@ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_cdatasection_construct, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/characterdata.c?r1=1.15.2.1.2.2.2.6&r2=1.15.2.1.2.2.2.7&diff_format=u Index: php-src/ext/dom/characterdata.c diff -u php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.6 php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.7 --- php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.6 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/characterdata.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: characterdata.c,v 1.15.2.1.2.2.2.6 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: characterdata.c,v 1.15.2.1.2.2.2.7 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,25 +29,30 @@ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_substring_data, 0, 0, 2) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, count) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_append_data, 0, 0, 1) ZEND_ARG_INFO(0, arg) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_insert_data, 0, 0, 2) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, arg) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_delete_data, 0, 0, 2) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, count) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_replace_data, 0, 0, 3) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, count) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/comment.c?r1=1.11.2.1.2.1.2.7&r2=1.11.2.1.2.1.2.8&diff_format=u Index: php-src/ext/dom/comment.c diff -u php-src/ext/dom/comment.c:1.11.2.1.2.1.2.7 php-src/ext/dom/comment.c:1.11.2.1.2.1.2.8 --- php-src/ext/dom/comment.c:1.11.2.1.2.1.2.7 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/comment.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: comment.c,v 1.11.2.1.2.1.2.7 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: comment.c,v 1.11.2.1.2.1.2.8 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,6 +29,7 @@ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_comment_construct, 0, 0, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5.2.9&r2=1.68.2.3.2.5.2.10&diff_format=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.68.2.3.2.5.2.9 php-src/ext/dom/document.c:1.68.2.3.2.5.2.10 --- php-src/ext/dom/document.c:1.68.2.3.2.5.2.9 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/document.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.68.2.3.2.5.2.9 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: document.c,v 1.68.2.3.2.5.2.10 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,142 +42,175 @@ #define DOM_LOAD_FILE 1 /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_element, 0, 0, 1) ZEND_ARG_INFO(0, tagName) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_document_fragment, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_text_node, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_comment, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_cdatasection, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_processing_instruction, 0, 0, 2) ZEND_ARG_INFO(0, target) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_attribute, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_entity_reference, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_get_elements_by_tag_name, 0, 0, 1) ZEND_ARG_INFO(0, tagName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_import_node, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, importedNode, DOMNode, 0) ZEND_ARG_INFO(0, deep) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_element_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, qualifiedName) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_attribute_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, qualifiedName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_get_elements_by_tag_name_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_get_element_by_id, 0, 0, 1) ZEND_ARG_INFO(0, elementId) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_adopt_node, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, source, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_normalize_document, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_rename_node, 0, 0, 3) ZEND_ARG_OBJ_INFO(0, node, DOMNode, 0) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, qualifiedName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_load, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_save, 0, 0, 1) ZEND_ARG_INFO(0, file) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_loadxml, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_savexml, 0, 0, 0) ZEND_ARG_OBJ_INFO(0, node, DOMNode, 1) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_construct, 0, 0, 0) ZEND_ARG_INFO(0, version) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_validate, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_xinclude, 0, 0, 0) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_loadhtml, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_loadhtmlfile, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_savehtml, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_savehtmlfile, 0, 0, 1) ZEND_ARG_INFO(0, file) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_schema_validate_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_schema_validate_xml, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_relaxNG_validate_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_relaxNG_validate_xml, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_registernodeclass, 0, 0, 2) ZEND_ARG_INFO(0, baseClass) ZEND_ARG_INFO(0, extendedClass) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documentfragment.c?r1=1.15.2.1.2.1.2.7&r2=1.15.2.1.2.1.2.8&diff_format=u Index: php-src/ext/dom/documentfragment.c diff -u php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.7 php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.8 --- php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.7 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/documentfragment.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.7 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.8 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,9 +28,11 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_documentfragement_construct, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_documentfragement_appendXML, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domconfiguration.c?r1=1.5.2.1.2.1.2.6&r2=1.5.2.1.2.1.2.7&diff_format=u Index: php-src/ext/dom/domconfiguration.c diff -u php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.6 php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.7 --- php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.6 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/domconfiguration.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domconfiguration.c,v 1.5.2.1.2.1.2.6 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: domconfiguration.c,v 1.5.2.1.2.1.2.7 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,15 +28,18 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_get_parameter, 0, 0, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_can_set_parameter, 0, 0, 0) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domerrorhandler.c?r1=1.5.2.1.2.1.2.5&r2=1.5.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/domerrorhandler.c diff -u php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1.2.5 php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1.2.6 --- php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/domerrorhandler.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domerrorhandler.c,v 1.5.2.1.2.1.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: domerrorhandler.c,v 1.5.2.1.2.1.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,6 +28,7 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_domerrorhandler_handle_error, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, error, DOMError, 0) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementation.c?r1=1.15.2.2.2.2.2.6&r2=1.15.2.2.2.2.2.7&diff_format=u Index: php-src/ext/dom/domimplementation.c diff -u php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.6 php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.7 --- php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.6 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/domimplementation.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementation.c,v 1.15.2.2.2.2.2.6 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: domimplementation.c,v 1.15.2.2.2.2.2.7 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,20 +28,24 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_get_feature, 0, 0, 2) ZEND_ARG_INFO(0, feature) ZEND_ARG_INFO(0, version) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_has_feature, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_create_documenttype, 0, 0, 3) ZEND_ARG_INFO(0, qualifiedName) ZEND_ARG_INFO(0, publicId) ZEND_ARG_INFO(0, systemId) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_create_document, 0, 0, 3) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, qualifiedName) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementationlist.c?r1=1.6.2.1.2.1.2.5&r2=1.6.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/domimplementationlist.c diff -u php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1.2.5 php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1.2.6 --- php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/domimplementationlist.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementationlist.c,v 1.6.2.1.2.1.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: domimplementationlist.c,v 1.6.2.1.2.1.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,6 +28,7 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationlist_item, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementationsource.c?r1=1.5.2.1.2.1.2.5&r2=1.5.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/domimplementationsource.c diff -u php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1.2.5 php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1.2.6 --- php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/domimplementationsource.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementationsource.c,v 1.5.2.1.2.1.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: domimplementationsource.c,v 1.5.2.1.2.1.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,10 +29,12 @@ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationsource_getdomimplementation, 0, 0, 1) ZEND_ARG_INFO(0, features) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationsource_getdomimplementations, 0, 0, 1) ZEND_ARG_INFO(0, features) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domstringlist.c?r1=1.6.2.1.2.1.2.5&r2=1.6.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/domstringlist.c diff -u php-src/ext/dom/domstringlist.c:1.6.2.1.2.1.2.5 php-src/ext/dom/domstringlist.c:1.6.2.1.2.1.2.6 --- php-src/ext/dom/domstringlist.c:1.6.2.1.2.1.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/domstringlist.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domstringlist.c,v 1.6.2.1.2.1.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: domstringlist.c,v 1.6.2.1.2.1.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,6 +28,7 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_stringlist_item, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/element.c?r1=1.36.2.4.2.8.2.8&r2=1.36.2.4.2.8.2.9&diff_format=u Index: php-src/ext/dom/element.c diff -u php-src/ext/dom/element.c:1.36.2.4.2.8.2.8 php-src/ext/dom/element.c:1.36.2.4.2.8.2.9 --- php-src/ext/dom/element.c:1.36.2.4.2.8.2.8 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/element.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: element.c,v 1.36.2.4.2.8.2.8 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: element.c,v 1.36.2.4.2.8.2.9 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,90 +28,109 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_remove_attribute, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute_node, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute_node, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, newAttr, DOMAttr, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_remove_attribute_node, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, oldAttr, DOMAttr, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_elements_by_tag_name, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute_ns, 0, 0, 3) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, qualifiedName) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_remove_attribute_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute_node_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute_node_ns, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, newAttr, DOMAttr, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_elements_by_tag_name_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_has_attribute, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_has_attribute_ns, 0, 0, 2) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_id_attribute, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, isId) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_id_attribute_ns, 0, 0, 3) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_ARG_INFO(0, isId) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_id_attribute_node, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, attr, DOMAttr, 0) ZEND_ARG_INFO(0, isId) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_construct, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/entityreference.c?r1=1.12.2.1.2.2.2.6&r2=1.12.2.1.2.2.2.7&diff_format=u Index: php-src/ext/dom/entityreference.c diff -u php-src/ext/dom/entityreference.c:1.12.2.1.2.2.2.6 php-src/ext/dom/entityreference.c:1.12.2.1.2.2.2.7 --- php-src/ext/dom/entityreference.c:1.12.2.1.2.2.2.6 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/entityreference.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: entityreference.c,v 1.12.2.1.2.2.2.6 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: entityreference.c,v 1.12.2.1.2.2.2.7 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,6 +28,7 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_entityreference_construct, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/namednodemap.c?r1=1.15.2.2.2.1.2.5&r2=1.15.2.2.2.1.2.6&diff_format=u Index: php-src/ext/dom/namednodemap.c diff -u php-src/ext/dom/namednodemap.c:1.15.2.2.2.1.2.5 php-src/ext/dom/namednodemap.c:1.15.2.2.2.1.2.6 --- php-src/ext/dom/namednodemap.c:1.15.2.2.2.1.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/namednodemap.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: namednodemap.c,v 1.15.2.2.2.1.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: namednodemap.c,v 1.15.2.2.2.1.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,31 +28,38 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item, 0, 0, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_item, 0, 0, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item_ns, 0, 0, 0) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item_ns, 0, 0, 0) ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item_ns, 0, 0, 0) ZEND_ARG_INFO(0, namespaceURI) ZEND_ARG_INFO(0, localName) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/namelist.c?r1=1.7.2.1.2.1.2.5&r2=1.7.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/namelist.c diff -u php-src/ext/dom/namelist.c:1.7.2.1.2.1.2.5 php-src/ext/dom/namelist.c:1.7.2.1.2.1.2.6 --- php-src/ext/dom/namelist.c:1.7.2.1.2.1.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/namelist.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: namelist.c,v 1.7.2.1.2.1.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: namelist.c,v 1.7.2.1.2.1.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,10 +28,12 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namelist_get_name, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namelist_get_namespace_uri, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.9&r2=1.37.2.3.2.8.2.10&diff_format=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.9 php-src/ext/dom/node.c:1.37.2.3.2.8.2.10 --- php-src/ext/dom/node.c:1.37.2.3.2.8.2.9 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/node.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.37.2.3.2.8.2.9 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: node.c,v 1.37.2.3.2.8.2.10 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,84 +28,104 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0) ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0) ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1) ZEND_ARG_INFO(0, deep) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2) ZEND_ARG_INFO(0, feature) ZEND_ARG_INFO(0, version) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1) ZEND_ARG_INFO(0, namespaceURI) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1) ZEND_ARG_INFO(0, namespaceURI) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1) ZEND_ARG_INFO(0, prefix) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2) ZEND_ARG_INFO(0, feature) ZEND_ARG_INFO(0, version) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, handler) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0) ZEND_ARG_INFO(0, exclusive) ZEND_ARG_INFO(0, with_comments) @@ -113,6 +133,7 @@ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1) ZEND_ARG_INFO(0, uri) ZEND_ARG_INFO(0, exclusive) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/nodelist.c?r1=1.17.2.2.2.2.2.5&r2=1.17.2.2.2.2.2.6&diff_format=u Index: php-src/ext/dom/nodelist.c diff -u php-src/ext/dom/nodelist.c:1.17.2.2.2.2.2.5 php-src/ext/dom/nodelist.c:1.17.2.2.2.2.2.6 --- php-src/ext/dom/nodelist.c:1.17.2.2.2.2.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/nodelist.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nodelist.c,v 1.17.2.2.2.2.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: nodelist.c,v 1.17.2.2.2.2.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,6 +29,7 @@ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_nodelist_item, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.12.2.10&r2=1.73.2.12.2.12.2.11&diff_format=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.10 php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.11 --- php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.10 Wed Oct 29 21:21:47 2008 +++ php-src/ext/dom/php_dom.c Sun Nov 2 21:19:31 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.73.2.12.2.12.2.10 2008/10/29 21:21:47 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.73.2.12.2.12.2.11 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -510,6 +510,7 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_import_simplexml, 0, 0, 1) ZEND_ARG_INFO(0, node) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.17.2.1.2.1.2.8&r2=1.17.2.1.2.1.2.9&diff_format=u Index: php-src/ext/dom/processinginstruction.c diff -u php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.8 php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.9 --- php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.8 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/processinginstruction.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.8 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.9 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,6 +29,7 @@ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_processinginstruction_construct, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/string_extend.c?r1=1.5.2.1.2.1.2.5&r2=1.5.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/string_extend.c diff -u php-src/ext/dom/string_extend.c:1.5.2.1.2.1.2.5 php-src/ext/dom/string_extend.c:1.5.2.1.2.1.2.6 --- php-src/ext/dom/string_extend.c:1.5.2.1.2.1.2.5 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/string_extend.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string_extend.c,v 1.5.2.1.2.1.2.5 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: string_extend.c,v 1.5.2.1.2.1.2.6 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,10 +28,12 @@ #include "php_dom.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset16, 0, 0, 1) ZEND_ARG_INFO(0, offset32) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset32, 0, 0, 1) ZEND_ARG_INFO(0, offset16) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.23.2.1.2.4.2.8&r2=1.23.2.1.2.4.2.9&diff_format=u Index: php-src/ext/dom/text.c diff -u php-src/ext/dom/text.c:1.23.2.1.2.4.2.8 php-src/ext/dom/text.c:1.23.2.1.2.4.2.9 --- php-src/ext/dom/text.c:1.23.2.1.2.4.2.8 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/text.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: text.c,v 1.23.2.1.2.4.2.8 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: text.c,v 1.23.2.1.2.4.2.9 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,17 +29,21 @@ #include "dom_ce.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_split_text, 0, 0, 1) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_is_whitespace_in_element_content, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_replace_whole_text, 0, 0, 1) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_construct, 0, 0, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.1.2.7&r2=1.26.2.1.2.1.2.8&diff_format=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.7 php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.8 --- php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.7 Fri Oct 24 14:35:33 2008 +++ php-src/ext/dom/xpath.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.26.2.1.2.1.2.7 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: xpath.c,v 1.26.2.1.2.1.2.8 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,25 +37,30 @@ #if defined(LIBXML_XPATH_ENABLED) /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2) ZEND_ARG_INFO(0, prefix) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1) ZEND_ARG_INFO(0, expr) ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1) ZEND_ARG_INFO(0, expr) ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_php_functions, 0, 0, 0) ZEND_END_ARG_INFO(); /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/ereg.c?r1=1.90.2.7&r2=1.90.2.8&diff_format=u Index: php-src/ext/ereg/ereg.c diff -u php-src/ext/ereg/ereg.c:1.90.2.7 php-src/ext/ereg/ereg.c:1.90.2.8 --- php-src/ext/ereg/ereg.c:1.90.2.7 Fri Oct 24 14:35:33 2008 +++ php-src/ext/ereg/ereg.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: ereg.c,v 1.90.2.7 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: ereg.c,v 1.90.2.8 2008/11/02 21:19:31 felipe Exp $ */ #include <stdio.h> #include <ctype.h> @@ -27,42 +27,49 @@ #include "ext/standard/info.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ereg, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(1, registers) /* ARRAY_INFO(1, registers, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_eregi, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(1, registers) /* ARRAY_INFO(1, registers, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ereg_replace, 0) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, replacement) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_eregi_replace, 0) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, replacement) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_split, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, limit) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_spliti, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, limit) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sql_regcase, 0) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.10&r2=1.173.2.5.2.20.2.11&diff_format=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.10 php-src/ext/exif/exif.c:1.173.2.5.2.20.2.11 --- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.10 Fri Oct 24 14:35:33 2008 +++ php-src/ext/exif/exif.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.173.2.5.2.20.2.10 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: exif.c,v 1.173.2.5.2.20.2.11 2008/11/02 21:19:31 felipe Exp $ */ /* ToDos * @@ -102,10 +102,12 @@ #define MAX_IFD_NESTING_LEVEL 100 /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_exif_tagname, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_read_data, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, sections_needed) @@ -113,6 +115,7 @@ ZEND_ARG_INFO(0, read_thumbnail) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_thumbnail, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(1, width) @@ -120,6 +123,7 @@ ZEND_ARG_INFO(1, imagetype) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_exif_imagetype, 0) ZEND_ARG_INFO(0, imagefile) ZEND_END_ARG_INFO() @@ -138,7 +142,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.10 2008/10/24 14:35:33 felipe Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.11 2008/11/02 21:19:31 felipe Exp $" /* {{{ PHP_MINFO_FUNCTION */ http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20.2.18&r2=1.20.2.19&diff_format=u Index: php-src/ext/fileinfo/fileinfo.c diff -u php-src/ext/fileinfo/fileinfo.c:1.20.2.18 php-src/ext/fileinfo/fileinfo.c:1.20.2.19 --- php-src/ext/fileinfo/fileinfo.c:1.20.2.18 Fri Oct 24 14:35:33 2008 +++ php-src/ext/fileinfo/fileinfo.c Sun Nov 2 21:19:31 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fileinfo.c,v 1.20.2.18 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: fileinfo.c,v 1.20.2.19 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -117,24 +117,29 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_open, 0, 0, 0) ZEND_ARG_INFO(0, options) ZEND_ARG_INFO(0, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_close, 0, 0, 1) ZEND_ARG_INFO(0, finfo) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_set_flags, 0, 0, 2) ZEND_ARG_INFO(0, finfo) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_set_flags, 0, 0, 1) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_file, 0, 0, 2) ZEND_ARG_INFO(0, finfo) ZEND_ARG_INFO(0, filename) @@ -142,12 +147,14 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, options) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_buffer, 0, 0, 2) ZEND_ARG_INFO(0, finfo) ZEND_ARG_INFO(0, string) @@ -155,12 +162,14 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_buffer, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, options) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mime_content_type, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39.2.8&r2=1.52.2.39.2.9&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.52.2.39.2.8 php-src/ext/filter/filter.c:1.52.2.39.2.9 --- php-src/ext/filter/filter.c:1.52.2.39.2.8 Fri Oct 24 14:35:33 2008 +++ php-src/ext/filter/filter.c Sun Nov 2 21:19:31 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.52.2.39.2.8 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: filter.c,v 1.52.2.39.2.9 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -78,6 +78,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_input, 0, 0, 2) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, variable_name) @@ -85,30 +86,36 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_var, 0, 0, 1) ZEND_ARG_INFO(0, variable) ZEND_ARG_INFO(0, filter) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_input_array, 0, 0, 1) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, definition) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_var_array, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, definition) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_filter_list, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_has_var, 0, 0, 2) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, variable_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_id, 0, 0, 1) ZEND_ARG_INFO(0, filtername) ZEND_END_ARG_INFO() @@ -312,7 +319,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.8 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.9 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/php_ftp.c?r1=1.103.2.2.2.2.2.3&r2=1.103.2.2.2.2.2.4&diff_format=u Index: php-src/ext/ftp/php_ftp.c diff -u php-src/ext/ftp/php_ftp.c:1.103.2.2.2.2.2.3 php-src/ext/ftp/php_ftp.c:1.103.2.2.2.2.2.4 --- php-src/ext/ftp/php_ftp.c:1.103.2.2.2.2.2.3 Fri Oct 24 14:35:33 2008 +++ php-src/ext/ftp/php_ftp.c Sun Nov 2 21:19:31 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.103.2.2.2.2.2.3 2008/10/24 14:35:33 felipe Exp $ */ +/* $Id: php_ftp.c,v 1.103.2.2.2.2.2.4 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -45,6 +45,7 @@ #define le_ftpbuf_name "FTP Buffer" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, port) @@ -52,6 +53,7 @@ ZEND_END_ARG_INFO() #if HAVE_OPENSSL_EXT +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_ssl_connect, 0, 0, 1) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, port) @@ -59,72 +61,86 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_login, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_pwd, 0) ZEND_ARG_INFO(0, ftp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_cdup, 0) ZEND_ARG_INFO(0, ftp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_chdir, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_exec, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, command) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_raw, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, command) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_mkdir, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_rmdir, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_chmod, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_alloc, 0, 0, 2) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, size) ZEND_ARG_INFO(1, response) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_nlist, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_rawlist, 0, 0, 2) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, directory) ZEND_ARG_INFO(0, recursive) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_systype, 0) ZEND_ARG_INFO(0, ftp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fget, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, fp) @@ -133,6 +149,7 @@ ZEND_ARG_INFO(0, resumepos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, fp) @@ -141,11 +158,13 @@ ZEND_ARG_INFO(0, resumepos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_pasv, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, pasv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_get, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, local_file) @@ -154,6 +173,7 @@ ZEND_ARG_INFO(0, resume_pos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_get, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, local_file) @@ -162,10 +182,12 @@ ZEND_ARG_INFO(0, resume_pos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_nb_continue, 0) ZEND_ARG_INFO(0, ftp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fput, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, remote_file) @@ -174,6 +196,7 @@ ZEND_ARG_INFO(0, startpos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fput, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, remote_file) @@ -182,6 +205,7 @@ ZEND_ARG_INFO(0, startpos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_put, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, remote_file) @@ -190,6 +214,7 @@ ZEND_ARG_INFO(0, startpos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_put, 0, 0, 4) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, remote_file) @@ -198,42 +223,50 @@ ZEND_ARG_INFO(0, startpos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_size, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_mdtm, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_rename, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, src) ZEND_ARG_INFO(0, dest) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_delete, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, file) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_site, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, cmd) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_close, 0) ZEND_ARG_INFO(0, ftp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_set_option, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, option) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftp_get_option, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, option) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.20&r2=1.312.2.20.2.32.2.21&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.20 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.21 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.20 Fri Oct 24 14:35:34 2008 +++ php-src/ext/gd/gd.c Sun Nov 2 21:19:31 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.20 2008/10/24 14:35:34 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.21 2008/11/02 21:19:31 felipe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -169,27 +169,33 @@ static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_gd_info, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imageloadfont, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagesetstyle, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, styles) /* ARRAY_INFO(0, styles, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatetruecolor, 0) ZEND_ARG_INFO(0, x_size) ZEND_ARG_INFO(0, y_size) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imageistruecolor, 0) ZEND_ARG_INFO(0, im) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagetruecolortopalette, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, ditherFlag) @@ -197,17 +203,20 @@ ZEND_END_ARG_INFO() #if HAVE_GD_BUNDLED +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolormatch, 0) ZEND_ARG_INFO(0, im1) ZEND_ARG_INFO(0, im2) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagesetthickness, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, thickness) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefilledellipse, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, cx) @@ -217,6 +226,7 @@ ZEND_ARG_INFO(0, color) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefilledarc, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, cx) @@ -229,23 +239,27 @@ ZEND_ARG_INFO(0, style) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagealphablending, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, blend) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagesavealpha, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, save) ZEND_END_ARG_INFO() #if HAVE_GD_BUNDLED +static ZEND_BEGIN_ARG_INFO(arginfo_imagelayereffect, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, effect) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocatealpha, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -254,6 +268,7 @@ ZEND_ARG_INFO(0, alpha) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolvealpha, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -262,6 +277,7 @@ ZEND_ARG_INFO(0, alpha) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosestalpha, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -270,6 +286,7 @@ ZEND_ARG_INFO(0, alpha) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexactalpha, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -278,6 +295,7 @@ ZEND_ARG_INFO(0, alpha) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresampled, 0) ZEND_ARG_INFO(0, dst_im) ZEND_ARG_INFO(0, src_im) @@ -292,16 +310,19 @@ ZEND_END_ARG_INFO() #ifdef PHP_WIN32 +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegrabwindow, 0, 0, 1) ZEND_ARG_INFO(0, handle) ZEND_ARG_INFO(0, client_area) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagegrabscreen, 0) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GD_BUNDLED +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, angle) @@ -311,6 +332,7 @@ #endif #if HAVE_GD_IMAGESETTILE +static ZEND_BEGIN_ARG_INFO(arginfo_imagesettile, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, tile) @@ -318,71 +340,84 @@ #endif #if HAVE_GD_IMAGESETBRUSH +static ZEND_BEGIN_ARG_INFO(arginfo_imagesetbrush, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, brush) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreate, 0) ZEND_ARG_INFO(0, x_size) ZEND_ARG_INFO(0, y_size) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagetypes, 0) ZEND_END_ARG_INFO() #if HAVE_LIBGD15 +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromstring, 0) ZEND_ARG_INFO(0, image) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GD_GIF_READ +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgif, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GD_JPG +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromjpeg, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GD_PNG +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefrompng, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GD_XBM +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #endif #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GD_WBMP +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromwbmp, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #ifdef HAVE_GD_GD2 +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2part, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, srcX) @@ -393,6 +428,7 @@ #endif #if HAVE_GD_BUNDLED +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagexbm, 0, 0, 2) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) @@ -401,6 +437,7 @@ #endif #ifdef HAVE_GD_GIF_CREATE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegif, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) @@ -408,6 +445,7 @@ #endif #ifdef HAVE_GD_PNG +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepng, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) @@ -415,6 +453,7 @@ #endif #ifdef HAVE_GD_JPG +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagejpeg, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) @@ -423,6 +462,7 @@ #endif #ifdef HAVE_GD_WBMP +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagewbmp, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) @@ -430,12 +470,14 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() #ifdef HAVE_GD_GD2 +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd2, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) @@ -444,10 +486,12 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagedestroy, 0) ZEND_ARG_INFO(0, im) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocate, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -456,18 +500,21 @@ ZEND_END_ARG_INFO() #if HAVE_LIBGD15 +static ZEND_BEGIN_ARG_INFO(arginfo_imagepalettecopy, 0) ZEND_ARG_INFO(0, dst) ZEND_ARG_INFO(0, src) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorat, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x) ZEND_ARG_INFO(0, y) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosest, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -476,6 +523,7 @@ ZEND_END_ARG_INFO() #if HAVE_COLORCLOSESTHWB +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosesthwb, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -484,11 +532,13 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolordeallocate, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolve, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -496,6 +546,7 @@ ZEND_ARG_INFO(0, blue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexact, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, red) @@ -503,6 +554,7 @@ ZEND_ARG_INFO(0, blue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorset, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, color) @@ -511,17 +563,20 @@ ZEND_ARG_INFO(0, blue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorsforindex, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagegammacorrect, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, inputgamma) ZEND_ARG_INFO(0, outputgamma) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagesetpixel, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x) @@ -529,6 +584,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imageline, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x1) @@ -538,6 +594,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagedashedline, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x1) @@ -547,6 +604,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagerectangle, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x1) @@ -556,6 +614,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefilledrectangle, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x1) @@ -565,6 +624,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagearc, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, cx) @@ -576,6 +636,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imageellipse, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, cx) @@ -585,6 +646,7 @@ ZEND_ARG_INFO(0, color) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefilltoborder, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x) @@ -593,6 +655,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefill, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, x) @@ -600,20 +663,24 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorstotal, 0) ZEND_ARG_INFO(0, im) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecolortransparent, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imageinterlace, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, interlace) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagepolygon, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */ @@ -621,6 +688,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefilledpolygon, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */ @@ -628,14 +696,17 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefontwidth, 0) ZEND_ARG_INFO(0, font) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagefontheight, 0) ZEND_ARG_INFO(0, font) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagechar, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, font) @@ -645,6 +716,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecharup, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, font) @@ -654,6 +726,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagestring, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, font) @@ -663,6 +736,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagestringup, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, font) @@ -672,6 +746,7 @@ ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecopy, 0) ZEND_ARG_INFO(0, dst_im) ZEND_ARG_INFO(0, src_im) @@ -684,6 +759,7 @@ ZEND_END_ARG_INFO() #if HAVE_LIBGD15 +static ZEND_BEGIN_ARG_INFO(arginfo_imagecopymerge, 0) ZEND_ARG_INFO(0, src_im) ZEND_ARG_INFO(0, dst_im) @@ -696,6 +772,7 @@ ZEND_ARG_INFO(0, pct) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagecopymergegray, 0) ZEND_ARG_INFO(0, src_im) ZEND_ARG_INFO(0, dst_im) @@ -709,6 +786,7 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresized, 0) ZEND_ARG_INFO(0, dst_im) ZEND_ARG_INFO(0, src_im) @@ -722,16 +800,19 @@ ZEND_ARG_INFO(0, src_h) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagesx, 0) ZEND_ARG_INFO(0, im) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagesy, 0) ZEND_ARG_INFO(0, im) ZEND_END_ARG_INFO() #ifdef ENABLE_GD_TTF #if HAVE_LIBFREETYPE && HAVE_GD_STRINGFTEX +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4) ZEND_ARG_INFO(0, size) ZEND_ARG_INFO(0, angle) @@ -740,6 +821,7 @@ ZEND_ARG_INFO(0, extrainfo) /* ARRAY_INFO(0, extrainfo, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefttext, 0, 0, 8) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, size) @@ -753,6 +835,7 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_imagettfbbox, 0) ZEND_ARG_INFO(0, size) ZEND_ARG_INFO(0, angle) @@ -760,6 +843,7 @@ ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagettftext, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, size) @@ -773,35 +857,42 @@ #endif #ifdef HAVE_LIBT1 +static ZEND_BEGIN_ARG_INFO(arginfo_imagepsloadfont, 0) ZEND_ARG_INFO(0, pathname) ZEND_END_ARG_INFO() /* +static ZEND_BEGIN_ARG_INFO(arginfo_imagepscopyfont, 0) ZEND_ARG_INFO(0, font_index) ZEND_END_ARG_INFO() */ +static ZEND_BEGIN_ARG_INFO(arginfo_imagepsfreefont, 0) ZEND_ARG_INFO(0, font_index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagepsencodefont, 0) ZEND_ARG_INFO(0, font_index) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagepsextendfont, 0) ZEND_ARG_INFO(0, font_index) ZEND_ARG_INFO(0, extend) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imagepsslantfont, 0) ZEND_ARG_INFO(0, font_index) ZEND_ARG_INFO(0, slant) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepstext, 0, 0, 8) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, text) @@ -817,6 +908,7 @@ ZEND_ARG_INFO(0, antialias) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepsbbox, 0, 0, 3) ZEND_ARG_INFO(0, text) ZEND_ARG_INFO(0, font) @@ -828,6 +920,7 @@ #endif #ifdef HAVE_GD_WBMP +static ZEND_BEGIN_ARG_INFO_EX(arginfo_image2wbmp, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filename) @@ -836,6 +929,7 @@ #endif #if defined(HAVE_GD_JPG) && defined(HAVE_GD_WBMP) +static ZEND_BEGIN_ARG_INFO(arginfo_jpeg2wbmp, 0) ZEND_ARG_INFO(0, f_org) ZEND_ARG_INFO(0, f_dest) @@ -846,6 +940,7 @@ #endif #if defined(HAVE_GD_PNG) && defined(HAVE_GD_WBMP) +static ZEND_BEGIN_ARG_INFO(arginfo_png2wbmp, 0) ZEND_ARG_INFO(0, f_org) ZEND_ARG_INFO(0, f_dest) @@ -856,6 +951,7 @@ #endif #ifdef HAVE_GD_BUNDLED +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefilter, 0, 0, 2) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, filtertype) @@ -864,6 +960,7 @@ ZEND_ARG_INFO(0, arg3) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imageconvolution, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, matrix3x3) /* ARRAY_INFO(0, matrix3x3, 0) */ @@ -873,6 +970,7 @@ #endif #ifdef HAVE_GD_BUNDLED +static ZEND_BEGIN_ARG_INFO(arginfo_imageantialias, 0) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, on) http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/gettext.c?r1=1.46.2.2.2.4.2.7&r2=1.46.2.2.2.4.2.8&diff_format=u Index: php-src/ext/gettext/gettext.c diff -u php-src/ext/gettext/gettext.c:1.46.2.2.2.4.2.7 php-src/ext/gettext/gettext.c:1.46.2.2.2.4.2.8 --- php-src/ext/gettext/gettext.c:1.46.2.2.2.4.2.7 Sat Nov 1 23:09:31 2008 +++ php-src/ext/gettext/gettext.c Sun Nov 2 21:19:31 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.46.2.2.2.4.2.7 2008/11/01 23:09:31 jani Exp $ */ +/* $Id: gettext.c,v 1.46.2.2.2.4.2.8 2008/11/02 21:19:31 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,31 +31,37 @@ #include "php_gettext.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_textdomain, 0) ZEND_ARG_INFO(0, domain) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gettext, 0) ZEND_ARG_INFO(0, msgid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dgettext, 0) ZEND_ARG_INFO(0, domain_name) ZEND_ARG_INFO(0, msgid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dcgettext, 0) ZEND_ARG_INFO(0, domain_name) ZEND_ARG_INFO(0, msgid) ZEND_ARG_INFO(0, category) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bindtextdomain, 0) ZEND_ARG_INFO(0, domain_name) ZEND_ARG_INFO(0, dir) ZEND_END_ARG_INFO() #if HAVE_NGETTEXT +static ZEND_BEGIN_ARG_INFO(arginfo_ngettext, 0) ZEND_ARG_INFO(0, msgid1) ZEND_ARG_INFO(0, msgid2) @@ -64,6 +70,7 @@ #endif #if HAVE_DNGETTEXT +static ZEND_BEGIN_ARG_INFO(arginfo_dngettext, 0) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, msgid1) @@ -73,6 +80,7 @@ #endif #if HAVE_DCNGETTEXT +static ZEND_BEGIN_ARG_INFO(arginfo_dcngettext, 0) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, msgid1) @@ -83,6 +91,7 @@ #endif #if HAVE_BIND_TEXTDOMAIN_CODESET +static ZEND_BEGIN_ARG_INFO(arginfo_bind_textdomain_codeset, 0) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, codeset) http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.11.2.10&r2=1.49.2.2.2.11.2.11&diff_format=u Index: php-src/ext/gmp/gmp.c diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.11.2.10 php-src/ext/gmp/gmp.c:1.49.2.2.2.11.2.11 --- php-src/ext/gmp/gmp.c:1.49.2.2.2.11.2.10 Fri Oct 24 14:35:34 2008 +++ php-src/ext/gmp/gmp.c Sun Nov 2 21:19:31 2008 @@ -38,195 +38,235 @@ static int le_gmp; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_init, 0, 0, 1) ZEND_ARG_INFO(0, number) ZEND_ARG_INFO(0, base) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_intval, 0) ZEND_ARG_INFO(0, gmpnumber) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_strval, 0, 0, 1) ZEND_ARG_INFO(0, gmpnumber) ZEND_ARG_INFO(0, base) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_add, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_sub, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_mul, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_div_qr, 0, 0, 2) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_ARG_INFO(0, round) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_div_r, 0, 0, 2) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_ARG_INFO(0, round) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_div_q, 0, 0, 2) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_ARG_INFO(0, round) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_mod, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_divexact, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_neg, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_abs, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_fact, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_pow, 0) ZEND_ARG_INFO(0, base) ZEND_ARG_INFO(0, exp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_powm, 0) ZEND_ARG_INFO(0, base) ZEND_ARG_INFO(0, exp) ZEND_ARG_INFO(0, mod) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_sqrt, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_sqrtrem, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_perfect_square, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_prob_prime, 0, 0, 1) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, reps) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_gcd, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_gcdext, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_invert, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_jacobi, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_legendre, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_cmp, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_sign, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random, 0, 0, 0) ZEND_ARG_INFO(0, limiter) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_and, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_or, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_com, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_xor, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_setbit, 0, 0, 2) ZEND_ARG_INFO(1, a) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, set_clear) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_clrbit, 0) ZEND_ARG_INFO(1, a) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_testbit, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_popcount, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_hamdist, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_scan0, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, start) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_scan1, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, start) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gmp_nextprime, 0) ZEND_ARG_INFO(0, a) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.18.2.5.2.7.2.12&r2=1.18.2.5.2.7.2.13&diff_format=u Index: php-src/ext/hash/hash.c diff -u php-src/ext/hash/hash.c:1.18.2.5.2.7.2.12 php-src/ext/hash/hash.c:1.18.2.5.2.7.2.13 --- php-src/ext/hash/hash.c:1.18.2.5.2.7.2.12 Fri Oct 24 14:35:34 2008 +++ php-src/ext/hash/hash.c Sun Nov 2 21:19:32 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hash.c,v 1.18.2.5.2.7.2.12 2008/10/24 14:35:34 felipe Exp $ */ +/* $Id: hash.c,v 1.18.2.5.2.7.2.13 2008/11/02 21:19:32 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -867,11 +867,13 @@ /* {{{ arginfo */ #ifdef PHP_HASH_MD5_NOT_IN_CORE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_md5, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_md5_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, raw_output) @@ -879,29 +881,34 @@ #endif #ifdef PHP_HASH_SHA1_NOT_IN_CORE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_sha1, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_sha1_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash, 0, 0, 2) ZEND_ARG_INFO(0, algo) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_file, 0, 0, 2) ZEND_ARG_INFO(0, algo) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac, 0, 0, 3) ZEND_ARG_INFO(0, algo) ZEND_ARG_INFO(0, data) @@ -909,6 +916,7 @@ ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac_file, 0, 0, 3) ZEND_ARG_INFO(0, algo) ZEND_ARG_INFO(0, filename) @@ -916,51 +924,61 @@ ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_init, 0, 0, 1) ZEND_ARG_INFO(0, algo) ZEND_ARG_INFO(0, options) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_hash_update, 0) ZEND_ARG_INFO(0, context) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_update_stream, 0, 0, 2) ZEND_ARG_INFO(0, context) ZEND_ARG_INFO(0, handle) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_update_file, 0, 0, 2) ZEND_ARG_INFO(0, context) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_final, 0, 0, 1) ZEND_ARG_INFO(0, context) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_hash_copy, 0) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_hash_algos, 0) ZEND_END_ARG_INFO() /* BC Land */ #ifdef PHP_MHASH_BC +static ZEND_BEGIN_ARG_INFO(arginfo_mhash_get_block_size, 0) ZEND_ARG_INFO(0, hash) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mhash_get_hash_name, 0) ZEND_ARG_INFO(0, hash) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mhash_keygen_s2k, 0) ZEND_ARG_INFO(0, hash) ZEND_ARG_INFO(0, input_password) @@ -968,9 +986,11 @@ ZEND_ARG_INFO(0, bytes) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mhash_count, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mhash, 0, 0, 2) ZEND_ARG_INFO(0, hash) ZEND_ARG_INFO(0, data) http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.20.2.10&r2=1.124.2.8.2.20.2.11&diff_format=u Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.10 php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.11 --- php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.10 Fri Oct 24 14:35:34 2008 +++ php-src/ext/iconv/iconv.c Sun Nov 2 21:19:32 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.124.2.8.2.20.2.10 2008/10/24 14:35:34 felipe Exp $ */ +/* $Id: iconv.c,v 1.124.2.8.2.20.2.11 2008/11/02 21:19:32 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -63,11 +63,13 @@ ((c) == sizeof(unsigned long) ? *((unsigned long *)(a)) == *((unsigned long *)(b)) : ((c) == sizeof(unsigned int) ? *((unsigned int *)(a)) == *((unsigned int *)(b)) : memcmp(a, b, c) == 0)) /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strlen, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_substr, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, offset) @@ -75,6 +77,7 @@ ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strpos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -82,46 +85,54 @@ ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strrpos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_encode, 0, 0, 2) ZEND_ARG_INFO(0, field_name) ZEND_ARG_INFO(0, field_value) ZEND_ARG_INFO(0, preference) /* ZEND_ARG_ARRAY_INFO(0, preference, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_decode, 0, 0, 1) ZEND_ARG_INFO(0, encoded_string) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_decode_headers, 0, 0, 1) ZEND_ARG_INFO(0, headers) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_iconv, 0) ZEND_ARG_INFO(0, in_charset) ZEND_ARG_INFO(0, out_charset) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_iconv_handler, 0) ZEND_ARG_INFO(0, contents) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_iconv_set_encoding, 0) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_get_encoding, 0, 0, 0) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.21&r2=1.208.2.7.2.26.2.22&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.21 php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.22 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.21 Fri Oct 24 14:35:34 2008 +++ php-src/ext/imap/php_imap.c Sun Nov 2 21:19:32 2008 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.26.2.21 2008/10/24 14:35:34 felipe Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.26.2.22 2008/11/02 21:19:32 felipe Exp $ */ #define IMAP41 @@ -99,6 +99,7 @@ static PHP_GINIT_FUNCTION(imap); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3) ZEND_ARG_INFO(0, mailbox) ZEND_ARG_INFO(0, user) @@ -107,6 +108,7 @@ ZEND_ARG_INFO(0, n_retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_reopen, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) @@ -114,6 +116,7 @@ ZEND_ARG_INFO(0, n_retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_append, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, folder) @@ -121,35 +124,42 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_msg, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_ping, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_recent, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_END_ARG_INFO() #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quota, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, qroot) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quotaroot, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mbox) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_set_quota, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, qroot) ZEND_ARG_INFO(0, mailbox_size) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setacl, 0, 0, 4) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) @@ -157,31 +167,37 @@ ZEND_ARG_INFO(0, rights) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getacl, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_expunge, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_close, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headers, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_body, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_copy, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msglist) @@ -189,6 +205,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_move, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, sequence) @@ -196,34 +213,40 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_createmailbox, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_renamemailbox, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, old_name) ZEND_ARG_INFO(0, new_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_deletemailbox, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_list, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, ref) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getmailboxes, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, ref) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_listscan, 0, 0, 4) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, ref) @@ -231,22 +254,26 @@ ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_check, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_delete, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_undelete, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headerinfo, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) @@ -255,39 +282,46 @@ ZEND_ARG_INFO(0, default_host) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_parse_headers, 0, 0, 1) ZEND_ARG_INFO(0, headers) ZEND_ARG_INFO(0, default_host) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_lsub, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, ref) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getsubscribed, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, ref) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_subscribe, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_unsubscribe, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchstructure, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchbody, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) @@ -295,6 +329,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_savebody, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, file) @@ -303,49 +338,60 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_base64, 0, 0, 1) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_qprint, 0, 0, 1) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_8bit, 0, 0, 1) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_binary, 0, 0, 1) ZEND_ARG_INFO(0, text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mailboxmsginfo, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_write_address, 0, 0, 3) ZEND_ARG_INFO(0, mailbox) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, personal) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_parse_adrlist, 0, 0, 2) ZEND_ARG_INFO(0, address_string) ZEND_ARG_INFO(0, default_host) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8, 0, 0, 1) ZEND_ARG_INFO(0, mime_encoded_text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf7_decode, 0, 0, 1) ZEND_ARG_INFO(0, buf) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf7_encode, 0, 0, 1) ZEND_ARG_INFO(0, buf) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, sequence) @@ -353,6 +399,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_clearflag_full, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, sequence) @@ -360,6 +407,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_sort, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, criteria) @@ -369,45 +417,53 @@ ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchheader, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_uid, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_msgno, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, unique_msg_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_status, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, mailbox) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_bodystruct, 0, 0, 3) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, msg_no) ZEND_ARG_INFO(0, section) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetch_overview, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, sequence) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_compose, 0, 0, 2) ZEND_ARG_INFO(0, envelope) ZEND_ARG_INFO(0, body) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail, 0, 0, 3) ZEND_ARG_INFO(0, to) ZEND_ARG_INFO(0, subject) @@ -418,6 +474,7 @@ ZEND_ARG_INFO(0, rpath) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_search, 0, 0, 2) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, criteria) @@ -425,24 +482,30 @@ ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imap_alerts, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imap_errors, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_imap_last_error, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mime_header_decode, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_thread, 0, 0, 1) ZEND_ARG_INFO(0, stream_id) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_timeout, 0, 0, 1) ZEND_ARG_INFO(0, timeout_type) ZEND_ARG_INFO(0, timeout) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/interbase.c?r1=1.225.2.4.2.7.2.5&r2=1.225.2.4.2.7.2.6&diff_format=u Index: php-src/ext/interbase/interbase.c diff -u php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.5 php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.6 --- php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.5 Fri Oct 24 14:35:34 2008 +++ php-src/ext/interbase/interbase.c Sun Nov 2 21:19:32 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.225.2.4.2.7.2.5 2008/10/24 14:35:34 felipe Exp $ */ +/* $Id: interbase.c,v 1.225.2.4.2.7.2.6 2008/11/02 21:19:32 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -47,12 +47,15 @@ static PHP_GINIT_FUNCTION(ibase); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_ibase_errmsg, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ibase_errcode, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1) ZEND_ARG_INFO(0, database) ZEND_ARG_INFO(0, username) @@ -63,6 +66,7 @@ ZEND_ARG_INFO(0, role) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1) ZEND_ARG_INFO(0, database) ZEND_ARG_INFO(0, username) @@ -73,14 +77,17 @@ ZEND_ARG_INFO(0, role) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_close, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_drop_db, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_trans, 0, 0, 0) ZEND_ARG_INFO(0, trans_args) ZEND_ARG_INFO(0, link_identifier) @@ -88,70 +95,85 @@ ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit_ret, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback_ret, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_gen_id, 0, 0, 1) ZEND_ARG_INFO(0, generator) ZEND_ARG_INFO(0, increment) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_create, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_open, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, blob_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_add, 0, 0, 2) ZEND_ARG_INFO(0, blob_handle) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_get, 0, 0, 2) ZEND_ARG_INFO(0, blob_handle) ZEND_ARG_INFO(0, len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_close, 0, 0, 1) ZEND_ARG_INFO(0, blob_handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_cancel, 0, 0, 1) ZEND_ARG_INFO(0, blob_handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_info, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, blob_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_echo, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, blob_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_import, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, file) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_query, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, link_identifier) @@ -160,73 +182,88 @@ ZEND_ARG_INFO(0, bind_arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_affected_rows, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() #if abies_0 +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_rows, 0, 0, 1) ZEND_ARG_INFO(0, result_identifier) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_fetch_row, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, fetch_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_fetch_assoc, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, fetch_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_fetch_object, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, fetch_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_name_result, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_free_result, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_prepare, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_execute, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, bind_arg) ZEND_ARG_INFO(0, bind_arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_free_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_fields, 0, 0, 1) ZEND_ARG_INFO(0, query_result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_field_info, 0, 0, 2) ZEND_ARG_INFO(0, query_result) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_params, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_param_info, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_add_user, 0, 0, 3) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, user_name) @@ -236,6 +273,7 @@ ZEND_ARG_INFO(0, last_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_modify_user, 0, 0, 3) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, user_name) @@ -245,6 +283,7 @@ ZEND_ARG_INFO(0, last_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_delete_user, 0, 0, 3) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, user_name) @@ -254,16 +293,19 @@ ZEND_ARG_INFO(0, last_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_service_attach, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, dba_username) ZEND_ARG_INFO(0, dba_password) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_service_detach, 0, 0, 1) ZEND_ARG_INFO(0, service_handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_backup, 0, 0, 3) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, source_db) @@ -272,6 +314,7 @@ ZEND_ARG_INFO(0, verbose) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_restore, 0, 0, 3) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, source_file) @@ -280,6 +323,7 @@ ZEND_ARG_INFO(0, verbose) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_maintain_db, 0, 0, 3) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, db) @@ -287,6 +331,7 @@ ZEND_ARG_INFO(0, argument) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_db_info, 0, 0, 3) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, db) @@ -294,17 +339,20 @@ ZEND_ARG_INFO(0, argument) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_server_info, 0, 0, 2) ZEND_ARG_INFO(0, service_handle) ZEND_ARG_INFO(0, action) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_wait_event, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, event) ZEND_ARG_INFO(0, event2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_set_event_handler, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, handler) @@ -312,6 +360,7 @@ ZEND_ARG_INFO(0, event2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_free_event_handler, 0, 0, 1) ZEND_ARG_INFO(0, event) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/intl/php_intl.c?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: php-src/ext/intl/php_intl.c diff -u php-src/ext/intl/php_intl.c:1.1.2.6 php-src/ext/intl/php_intl.c:1.1.2.7 --- php-src/ext/intl/php_intl.c:1.1.2.6 Fri Oct 24 14:35:34 2008 +++ php-src/ext/intl/php_intl.c Sun Nov 2 21:19:33 2008 @@ -84,39 +84,47 @@ ZEND_DECLARE_MODULE_GLOBALS( intl ) /* {{{ Arguments info */ +static ZEND_BEGIN_ARG_INFO_EX(collator_static_0_args, 0, 0, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(collator_static_1_arg, 0, 0, 1) ZEND_ARG_INFO(0, arg1) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(collator_static_2_args, 0, 0, 2) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(collator_0_args, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, object, Collator, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(collator_1_arg, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, object, Collator, 0) ZEND_ARG_INFO(0, arg1) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(collator_2_args, 0, 0, 3) ZEND_ARG_OBJ_INFO(0, object, Collator, 0) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(collator_sort_args, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, object, Collator, 0) ZEND_ARG_ARRAY_INFO(1, arr, 0) ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_arginfo, 0, 0, 2) ZEND_ARG_INFO(0, formatter) ZEND_ARG_INFO(0, string) @@ -124,6 +132,7 @@ ZEND_ARG_INFO(1, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_currency_arginfo, 0, 0, 3) ZEND_ARG_INFO(0, formatter) ZEND_ARG_INFO(0, string) @@ -131,24 +140,29 @@ ZEND_ARG_INFO(1, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(locale_0_args, 0, 0, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(locale_1_arg, 0, 0, 1) ZEND_ARG_INFO(0, arg1) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(locale_2_args, 0, 0, 2) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(locale_3_args, 0, 0, 3) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) ZEND_ARG_INFO(0, arg3) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(locale_4_args, 0, 0, 4) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) @@ -159,33 +173,39 @@ #define intl_0_args collator_static_0_args #define intl_1_arg collator_static_1_arg +static ZEND_BEGIN_ARG_INFO_EX(normalizer_args, 0, 0, 1) ZEND_ARG_INFO(0, input) ZEND_ARG_INFO(0, form) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(grapheme_1_arg, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(grapheme_search_args, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(grapheme_substr_args, 0, 0, 2) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, start) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(grapheme_strstr_args, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, before_needle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(grapheme_extract_args, 0, 0, 2) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) @@ -194,120 +214,143 @@ ZEND_ARG_INFO(1, arg5) /* 1 = pass by reference */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(datefmt_parse_args, 0, 0, 2) ZEND_ARG_INFO(0, formatter) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(1, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_create, 0, 0, 2) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, style) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_get_error_code, 0, 0, 1) ZEND_ARG_INFO(0, nf) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_format, 0, 0, 2) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, num) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_format_currency, 0, 0, 3) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, num) ZEND_ARG_INFO(0, currency) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_get_attribute, 0, 0, 2) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, attr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_set_attribute, 0, 0, 3) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, attr) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_set_symbol, 0, 0, 3) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, attr) ZEND_ARG_INFO(0, symbol) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_set_pattern, 0, 0, 2) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_get_locale, 0, 0, 1) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_create, 0, 0, 2) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_get_error_code, 0, 0, 1) ZEND_ARG_INFO(0, nf) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_get_error_message, 0, 0, 1) ZEND_ARG_INFO(0, coll) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_format, 0, 0, 2) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_format_message, 0, 0, 3) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_parse, 0, 0, 2) ZEND_ARG_INFO(0, nf) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_parse_message, 0, 0, 3) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_set_pattern, 0, 0, 2) ZEND_ARG_INFO(0, mf) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_get_locale, 0, 0, 1) ZEND_ARG_INFO(0, mf) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_set_pattern, 0, 0, 2) ZEND_ARG_INFO(0, mf) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_set_calendar, 0, 0, 2) ZEND_ARG_INFO(0, mf) ZEND_ARG_INFO(0, calendar) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_format, 0, 0, 0) ZEND_ARG_INFO(0, args) ZEND_ARG_INFO(0, array) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_create, 0, 0, 3) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, date_type) http://cvs.php.net/viewvc.cgi/php-src/ext/intl/collator/collator_class.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/intl/collator/collator_class.c diff -u php-src/ext/intl/collator/collator_class.c:1.1.2.3 php-src/ext/intl/collator/collator_class.c:1.1.2.4 --- php-src/ext/intl/collator/collator_class.c:1.1.2.3 Fri Oct 24 14:35:35 2008 +++ php-src/ext/intl/collator/collator_class.c Sun Nov 2 21:19:33 2008 @@ -88,18 +88,22 @@ modify approptiate 'collator_XX_args' for the procedural API. */ +static ZEND_BEGIN_ARG_INFO_EX( collator_0_args, 0, 0, 0 ) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX( collator_1_arg, 0, 0, 1 ) ZEND_ARG_INFO( 0, arg1 ) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX( collator_2_args, 0, 0, 2 ) ZEND_ARG_INFO( 0, arg1 ) ZEND_ARG_INFO( 0, arg2 ) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX( collator_sort_args, 0, 0, 1 ) ZEND_ARG_ARRAY_INFO( 1, arr, 0 ) ZEND_ARG_INFO( 0, flags ) http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_class.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-src/ext/intl/dateformat/dateformat_class.c diff -u php-src/ext/intl/dateformat/dateformat_class.c:1.1.2.5 php-src/ext/intl/dateformat/dateformat_class.c:1.1.2.6 --- php-src/ext/intl/dateformat/dateformat_class.c:1.1.2.5 Fri Oct 24 14:35:35 2008 +++ php-src/ext/intl/dateformat/dateformat_class.c Sun Nov 2 21:19:33 2008 @@ -84,35 +84,43 @@ */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(datefmt_parse_args, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(1, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_format, 0, 0, 0) ZEND_ARG_INFO(0, args) ZEND_ARG_INFO(0, array) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_intldateformatter_getdatetype, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_settimezoneid, 0, 0, 1) ZEND_ARG_INFO(0, zone) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setpattern, 0, 0, 1) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setlenient, 0, 0, 1) ZEND_ARG_INFO(0, lenient) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setcalendar, 0, 0, 1) ZEND_ARG_INFO(0, which) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter___construct, 0, 0, 3) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, datetype) http://cvs.php.net/viewvc.cgi/php-src/ext/intl/formatter/formatter_class.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/intl/formatter/formatter_class.c diff -u php-src/ext/intl/formatter/formatter_class.c:1.1.2.3 php-src/ext/intl/formatter/formatter_class.c:1.1.2.4 --- php-src/ext/intl/formatter/formatter_class.c:1.1.2.3 Fri Oct 24 14:35:35 2008 +++ php-src/ext/intl/formatter/formatter_class.c Sun Nov 2 21:19:33 2008 @@ -80,54 +80,65 @@ */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(number_parse_arginfo, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(1, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(number_parse_currency_arginfo, 0, 0, 2) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(1, currency) ZEND_ARG_INFO(1, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_getattribute, 0, 0, 1) ZEND_ARG_INFO(0, attr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setattribute, 0, 0, 2) ZEND_ARG_INFO(0, attr) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setsymbol, 0, 0, 2) ZEND_ARG_INFO(0, attr) ZEND_ARG_INFO(0, symbol) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_numberformatter_getpattern, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setpattern, 0, 0, 1) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_getlocale, 0, 0, 0) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter___construct, 0, 0, 2) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, style) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_formatcurrency, 0, 0, 2) ZEND_ARG_INFO(0, num) ZEND_ARG_INFO(0, currency) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_format, 0, 0, 1) ZEND_ARG_INFO(0, num) ZEND_ARG_INFO(0, type) http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_class.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-src/ext/intl/locale/locale_class.c diff -u php-src/ext/intl/locale/locale_class.c:1.1.2.5 php-src/ext/intl/locale/locale_class.c:1.1.2.6 --- php-src/ext/intl/locale/locale_class.c:1.1.2.5 Fri Oct 24 14:35:35 2008 +++ php-src/ext/intl/locale/locale_class.c Sun Nov 2 21:19:33 2008 @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: locale_class.c,v 1.1.2.5 2008/10/24 14:35:35 felipe Exp $ */ +/* $Id: locale_class.c,v 1.1.2.6 2008/11/02 21:19:33 felipe Exp $ */ #include <unicode/uloc.h> #include "php_intl.h" @@ -35,24 +35,29 @@ * approptiate 'locale_XX_args' for the procedural API! */ +static ZEND_BEGIN_ARG_INFO_EX( locale_0_args, 0, 0, 0 ) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX( locale_1_arg, 0, 0, 1 ) ZEND_ARG_INFO( 0, arg1 ) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX( locale_2_args, 0, 0, 2 ) ZEND_ARG_INFO( 0, arg1 ) ZEND_ARG_INFO( 0, arg2 ) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX( locale_3_args, 0, 0, 3 ) ZEND_ARG_INFO( 0, arg1 ) ZEND_ARG_INFO( 0, arg2 ) ZEND_ARG_INFO( 0, arg3 ) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX( locale_4_args, 0, 0, 4 ) ZEND_ARG_INFO( 0, arg1 ) ZEND_ARG_INFO( 0, arg2 ) http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat_class.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/intl/msgformat/msgformat_class.c diff -u php-src/ext/intl/msgformat/msgformat_class.c:1.1.2.3 php-src/ext/intl/msgformat/msgformat_class.c:1.1.2.4 --- php-src/ext/intl/msgformat/msgformat_class.c:1.1.2.3 Fri Oct 24 14:35:35 2008 +++ php-src/ext/intl/msgformat/msgformat_class.c Sun Nov 2 21:19:33 2008 @@ -77,28 +77,34 @@ */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter___construct, 0, 0, 2) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_messageformatter_geterrormessage, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_formatmessage, 0, 0, 3) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_format, 0, 0, 1) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_setpattern, 0, 0, 1) ZEND_ARG_INFO(0, pattern) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_parse, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/intl/normalizer/normalizer_class.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/intl/normalizer/normalizer_class.c diff -u php-src/ext/intl/normalizer/normalizer_class.c:1.1.2.3 php-src/ext/intl/normalizer/normalizer_class.c:1.1.2.4 --- php-src/ext/intl/normalizer/normalizer_class.c:1.1.2.3 Fri Oct 24 14:35:35 2008 +++ php-src/ext/intl/normalizer/normalizer_class.c Sun Nov 2 21:19:33 2008 @@ -29,6 +29,7 @@ /* {{{ Normalizer methods arguments info */ +static ZEND_BEGIN_ARG_INFO_EX( normalizer_3_args, 0, 0, 3 ) ZEND_ARG_INFO( 0, arg1 ) ZEND_ARG_INFO( 0, arg2 ) http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.10&r2=1.9.2.19.2.11&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.19.2.10 php-src/ext/json/json.c:1.9.2.19.2.11 --- php-src/ext/json/json.c:1.9.2.19.2.10 Fri Oct 24 14:35:35 2008 +++ php-src/ext/json/json.c Sun Nov 2 21:19:33 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.19.2.10 2008/10/24 14:35:35 felipe Exp $ */ +/* $Id: json.c,v 1.9.2.19.2.11 2008/11/02 21:19:33 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,10 +42,12 @@ #define PHP_JSON_HEX_QUOT (1<<3) /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_json_encode, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_json_decode, 0, 0, 1) ZEND_ARG_INFO(0, json) ZEND_ARG_INFO(0, assoc) http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.19&r2=1.161.2.3.2.11.2.20&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.19 php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.20 --- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.19 Fri Oct 24 14:35:35 2008 +++ php-src/ext/ldap/ldap.c Sun Nov 2 21:19:34 2008 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.161.2.3.2.11.2.19 2008/10/24 14:35:35 felipe Exp $ */ +/* $Id: ldap.c,v 1.161.2.3.2.11.2.20 2008/11/02 21:19:34 felipe Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -224,7 +224,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.19 2008/10/24 14:35:35 felipe Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.20 2008/11/02 21:19:34 felipe Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -2204,15 +2204,18 @@ #endif /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, port) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_resource, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, bind_rdn) @@ -2220,6 +2223,7 @@ ZEND_END_ARG_INFO() #ifdef HAVE_LDAP_SASL +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_sasl_bind, 0, 0, 1) ZEND_ARG_INFO(0, link) ZEND_ARG_INFO(0, binddn) @@ -2231,6 +2235,7 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, base_dn) @@ -2242,6 +2247,7 @@ ZEND_ARG_INFO(0, deref) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_list, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, base_dn) @@ -2253,6 +2259,7 @@ ZEND_ARG_INFO(0, deref) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_search, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, base_dn) @@ -2264,106 +2271,126 @@ ZEND_ARG_INFO(0, deref) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_count_entries, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_entry, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_entry, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_entries, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_attribute, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_entry_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_attribute, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_entry_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_attributes, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_entry_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_values, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_entry_identifier) ZEND_ARG_INFO(0, attribute) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_values_len, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_entry_identifier) ZEND_ARG_INFO(0, attribute) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_dn, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_entry_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_explode_dn, 0, 0, 2) ZEND_ARG_INFO(0, dn) ZEND_ARG_INFO(0, with_attrib) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_dn2ufn, 0, 0, 1) ZEND_ARG_INFO(0, dn) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_add, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_delete, 0, 0, 2) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_modify, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_mod_add, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_mod_replace, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_mod_del, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_err2str, 0, 0, 1) ZEND_ARG_INFO(0, errno) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_compare, 0, 0, 4) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) @@ -2371,6 +2398,7 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_sort, 0, 0, 3) ZEND_ARG_INFO(0, link) ZEND_ARG_INFO(0, result) @@ -2378,6 +2406,7 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP_10 +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename, 0, 0, 5) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, dn) @@ -2386,29 +2415,34 @@ ZEND_ARG_INFO(0, deleteoldrdn) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_option, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, option) ZEND_ARG_INFO(1, retval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_set_option, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, option) ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_reference, 0, 0, 2) ZEND_ARG_INFO(0, link) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_reference, 0, 0, 2) ZEND_ARG_INFO(0, link) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() #ifdef HAVE_LDAP_PARSE_REFERENCE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_parse_reference, 0, 0, 3) ZEND_ARG_INFO(0, link) ZEND_ARG_INFO(0, entry) @@ -2418,6 +2452,7 @@ #ifdef HAVE_LDAP_PARSE_RESULT +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_parse_result, 0, 0, 3) ZEND_ARG_INFO(0, link) ZEND_ARG_INFO(0, result) @@ -2430,6 +2465,7 @@ #endif #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC) +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_set_rebind_proc, 0, 0, 2) ZEND_ARG_INFO(0, link) ZEND_ARG_INFO(0, callback) @@ -2437,10 +2473,12 @@ #endif #ifdef STR_TRANSLATION +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_t61_to_8859, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_8859_to_t61, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.15.2.7&r2=1.32.2.7.2.15.2.8&diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.7 php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.8 --- php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.7 Fri Oct 24 14:35:35 2008 +++ php-src/ext/libxml/libxml.c Sun Nov 2 21:19:34 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: libxml.c,v 1.32.2.7.2.15.2.7 2008/10/24 14:35:35 felipe Exp $ */ +/* $Id: libxml.c,v 1.32.2.7.2.15.2.8 2008/11/02 21:19:34 felipe Exp $ */ #define IS_EXT_MODULE @@ -87,20 +87,25 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_libxml_set_streams_context, 0) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_libxml_use_internal_errors, 0) ZEND_ARG_INFO(0, use_errors) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_libxml_get_last_error, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_libxml_get_errors, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_libxml_clear_errors, 0) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.36&r2=1.224.2.22.2.25.2.37&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.36 php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.37 --- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.36 Fri Oct 24 14:35:35 2008 +++ php-src/ext/mbstring/mbstring.c Sun Nov 2 21:19:34 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.224.2.22.2.25.2.36 2008/10/24 14:35:35 felipe Exp $ */ +/* $Id: mbstring.c,v 1.224.2.22.2.25.2.37 2008/11/02 21:19:34 felipe Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -208,49 +208,60 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_language, 0, 0, 0) ZEND_ARG_INFO(0, language) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_internal_encoding, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_input, 0, 0, 0) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_output, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_detect_order, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substitute_character, 0, 0, 0) ZEND_ARG_INFO(0, substchar) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_preferred_mime_name, 0, 0, 1) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_parse_str, 0, 0, 1) ZEND_ARG_INFO(0, encoded_string) ZEND_ARG_INFO(1, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_output_handler, 0, 0, 2) ZEND_ARG_INFO(0, contents) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strlen, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strpos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -258,6 +269,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrpos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -265,6 +277,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stripos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -272,6 +285,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strripos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -279,6 +293,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strstr, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -286,6 +301,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrchr, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -293,6 +309,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stristr, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -300,6 +317,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrichr, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) @@ -307,12 +325,14 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substr_count, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substr, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, start) @@ -320,6 +340,7 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strcut, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, start) @@ -327,11 +348,13 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strwidth, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strimwidth, 0, 0, 3) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, start) @@ -340,41 +363,49 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_encoding, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, to) ZEND_ARG_INFO(0, from) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_case, 0, 0, 2) ZEND_ARG_INFO(0, sourcestring) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strtoupper, 0, 0, 1) ZEND_ARG_INFO(0, sourcestring) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strtolower, 0, 0, 1) ZEND_ARG_INFO(0, sourcestring) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_detect_encoding, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, encoding_list) ZEND_ARG_INFO(0, strict) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mb_list_encodings, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encoding_aliases, 0, 0, 1) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encode_mimeheader, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, charset) @@ -383,34 +414,40 @@ ZEND_ARG_INFO(0, indent) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_mimeheader, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_kana, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, option) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_variables, 1, 0, 3) ZEND_ARG_INFO(0, to) ZEND_ARG_INFO(0, from) ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encode_numericentity, 0, 0, 2) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, convmap) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_numericentity, 0, 0, 2) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, convmap) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_send_mail, 0, 0, 3) ZEND_ARG_INFO(0, to) ZEND_ARG_INFO(0, subject) @@ -419,31 +456,37 @@ ZEND_ARG_INFO(0, additional_parameters) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_get_info, 0, 0, 0) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_check_encoding, 0, 0, 0) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_encoding, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(1, registers) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_eregi, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(1, registers) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_replace, 0, 0, 3) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, replacement) @@ -451,55 +494,66 @@ ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_eregi_replace, 0, 0, 3) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, replacement) ZEND_ARG_INFO(0, string) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_split, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, limit) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_match, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search, 0, 0, 0) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_pos, 0, 0, 0) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_regs, 0, 0, 0) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_init, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mb_ereg_search_getregs, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mb_ereg_search_getpos, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_setpos, 0, 0, 1) ZEND_ARG_INFO(0, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_set_options, 0, 0, 0) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.11.2.13&r2=1.91.2.3.2.11.2.14&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.13 php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.14 --- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.13 Fri Oct 24 14:35:35 2008 +++ php-src/ext/mcrypt/mcrypt.c Sun Nov 2 21:19:34 2008 @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.13 2008/10/24 14:35:35 felipe Exp $ */ +/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.14 2008/11/02 21:19:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -50,6 +50,7 @@ } php_mcrypt; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_open, 0, 0, 4) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, cipher_directory) @@ -57,132 +58,161 @@ ZEND_ARG_INFO(0, mode_directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_generic_init, 0, 0, 3) ZEND_ARG_INFO(0, td) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_generic, 0, 0, 2) ZEND_ARG_INFO(0, td) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mdecrypt_generic, 0, 0, 2) ZEND_ARG_INFO(0, td) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_supported_key_sizes, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_self_test, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_close, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_generic_deinit, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_is_block_algorithm_mode, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_is_block_algorithm, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_is_block_mode, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_block_size, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_key_size, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_iv_size, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_algorithms_name, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_modes_name, 0, 0, 1) ZEND_ARG_INFO(0, td) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_self_test, 0, 0, 1) ZEND_ARG_INFO(0, algorithm) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_is_block_algorithm_mode, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_is_block_algorithm, 0, 0, 1) ZEND_ARG_INFO(0, algorithm) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_is_block_mode, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_get_algo_block_size, 0, 0, 1) ZEND_ARG_INFO(0, algorithm) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_get_algo_key_size, 0, 0, 1) ZEND_ARG_INFO(0, algorithm) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_get_supported_key_sizes, 0, 0, 1) ZEND_ARG_INFO(0, algorithm) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_list_algorithms, 0, 0, 0) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_list_modes, 0, 0, 0) ZEND_ARG_INFO(0, lib_dir) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_key_size, 0, 0, 2) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, module) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_block_size, 0, 0, 2) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, module) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_iv_size, 0, 0, 2) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, module) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_cipher_name, 0, 0, 1) ZEND_ARG_INFO(0, cipher) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_encrypt, 0, 0, 5) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, key) @@ -191,6 +221,7 @@ ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_decrypt, 0, 0, 5) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, key) @@ -199,6 +230,7 @@ ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ecb, 0, 0, 5) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, key) @@ -207,6 +239,7 @@ ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cbc, 0, 0, 5) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, key) @@ -215,6 +248,7 @@ ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cfb, 0, 0, 5) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, key) @@ -223,6 +257,7 @@ ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ofb, 0, 0, 5) ZEND_ARG_INFO(0, cipher) ZEND_ARG_INFO(0, key) @@ -231,6 +266,7 @@ ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_create_iv, 0, 0, 2) ZEND_ARG_INFO(0, size) ZEND_ARG_INFO(0, source) http://cvs.php.net/viewvc.cgi/php-src/ext/msql/php_msql.c?r1=1.60.2.4.2.2.2.8&r2=1.60.2.4.2.2.2.9&diff_format=u Index: php-src/ext/msql/php_msql.c diff -u php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.8 php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.9 --- php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.8 Fri Oct 24 14:35:35 2008 +++ php-src/ext/msql/php_msql.c Sun Nov 2 21:19:34 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.60.2.4.2.2.2.8 2008/10/24 14:35:35 felipe Exp $ */ +/* $Id: php_msql.c,v 1.60.2.4.2.2.2.9 2008/11/02 21:19:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,138 +46,166 @@ #define MSQL_BOTH (MSQL_ASSOC|MSQL_NUM) /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_connect, 0, 0, 0) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_pconnect, 0, 0, 0) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_close, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_select_db, 0, 0, 1) ZEND_ARG_INFO(0, database_name) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_create_db, 0, 0, 1) ZEND_ARG_INFO(0, database_name) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_drop_db, 0, 0, 1) ZEND_ARG_INFO(0, database_name) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_db_query, 0, 0, 2) ZEND_ARG_INFO(0, database_name) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_dbs, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_tables, 0, 0, 1) ZEND_ARG_INFO(0, database_name) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_fields, 0, 0, 2) ZEND_ARG_INFO(0, database_name) ZEND_ARG_INFO(0, table_name) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_msql_error, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_result, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, row) ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_rows, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_fields, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_row, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_object, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_array, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_data_seek, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, row_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_field, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_seek, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_name, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_table, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_len, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_offet) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_type, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_flags, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, field_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_free_result, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_affected_rows, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4.2.12&r2=1.152.2.13.2.4.2.13&diff_format=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.12 php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.13 --- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.12 Fri Oct 24 14:35:36 2008 +++ php-src/ext/mssql/php_mssql.c Sun Nov 2 21:19:34 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.12 2008/10/24 14:35:36 felipe Exp $ */ +/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.13 2008/11/02 21:19:34 felipe Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -48,6 +48,7 @@ static void _mssql_bind_hash_dtor(void *data); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_connect, 0, 0, 0) ZEND_ARG_INFO(0, servername) ZEND_ARG_INFO(0, username) @@ -55,71 +56,86 @@ ZEND_ARG_INFO(0, newlink) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_close, 0, 0, 0) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_select_db, 0, 0, 1) ZEND_ARG_INFO(0, database_name) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, batch_size) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_batch, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_rows_affected, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mssql_get_last_message, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_field, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_array, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_assoc, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_field_length, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_data_seek, 0, 0, 2) ZEND_ARG_INFO(0, result_identifier) ZEND_ARG_INFO(0, row_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_result, 0, 0, 3) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_min_error_severity, 0, 0, 1) ZEND_ARG_INFO(0, severity) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_init, 0, 0, 1) ZEND_ARG_INFO(0, sp_name) ZEND_ARG_INFO(0, link_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_bind, 0, 0, 4) ZEND_ARG_INFO(0, stmt) ZEND_ARG_INFO(0, param_name) @@ -130,15 +146,18 @@ ZEND_ARG_INFO(0, maxlen) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_execute, 0, 0, 1) ZEND_ARG_INFO(0, stmt) ZEND_ARG_INFO(0, skip_results) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_free_statement, 0, 0, 1) ZEND_ARG_INFO(0, stmt) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_guid_string, 0, 0, 1) ZEND_ARG_INFO(0, binary) ZEND_ARG_INFO(0, short_format) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.5.2.1.2.8&r2=1.49.2.5.2.1.2.9&diff_format=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.8 php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.9 --- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.8 Fri Oct 24 14:35:36 2008 +++ php-src/ext/mysqli/mysqli_fe.c Sun Nov 2 21:19:34 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.8 2008/10/24 14:35:36 felipe Exp $ + $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.9 2008/11/02 21:19:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H @@ -30,15 +30,18 @@ #include "php_mysqli_structs.h" +static ZEND_BEGIN_ARG_INFO(second_arg_force_by_ref_rest, 1) ZEND_ARG_PASS_INFO(0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(third_arg_force_by_ref_rest, 1) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.24&r2=1.269.2.16.2.38.2.25&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.24 php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.25 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.24 Fri Oct 24 14:35:36 2008 +++ php-src/ext/oci8/oci8.c Sun Nov 2 21:19:34 2008 @@ -26,7 +26,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.269.2.16.2.38.2.24 2008/10/24 14:35:36 felipe Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.38.2.25 2008/11/02 21:19:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -115,6 +115,7 @@ #ifdef ZEND_ENGINE_2 /* {{{ Function arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_name) @@ -122,6 +123,7 @@ ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_bind_by_name, 0, 0, 3) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_name) @@ -130,6 +132,7 @@ ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_bind_array_by_name, 0, 0, 4) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_name) @@ -139,99 +142,119 @@ ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_free_descriptor, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_save, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_import, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_load, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_read, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_eof, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_tell, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_rewind, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_seek, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, whence) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_size, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_append, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor_to) ZEND_ARG_INFO(0, lob_descriptor_from) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_truncate, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_erase, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_flush, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, flag) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ocisetbufferinglob, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ocigetbufferinglob, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_copy, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor_to) ZEND_ARG_INFO(0, lob_descriptor_from) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_is_equal, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, lob_descriptor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_export, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) ZEND_ARG_INFO(0, filename) @@ -239,77 +262,93 @@ ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_descriptor, 0, 0, 1) ZEND_ARG_INFO(0, connection_resource) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_rollback, 0, 0, 1) ZEND_ARG_INFO(0, connection_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_commit, 0, 0, 1) ZEND_ARG_INFO(0, connection_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_name, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_size, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number_or_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_scale, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_precision, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_type, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_type_raw, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_is_null, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number_or_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_internal_debug, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_execute, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_cancel, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ocifetchinto, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(1, result) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_all, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(1, output) @@ -318,31 +357,38 @@ ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_object, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_row, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_assoc, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_array, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_free_statement, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_close, 0, 0, 1) ZEND_ARG_INFO(0, connection_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_connect, 0, 0, 2) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) @@ -351,6 +397,7 @@ ZEND_ARG_INFO(0, session_mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_connect, 0, 0, 2) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) @@ -359,6 +406,7 @@ ZEND_ARG_INFO(0, session_mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_pconnect, 0, 0, 2) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) @@ -367,24 +415,29 @@ ZEND_ARG_INFO(0, session_mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_error, 0, 0, 0) ZEND_ARG_INFO(0, connection_or_statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_num_fields, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_parse, 0, 0, 2) ZEND_ARG_INFO(0, connection_resource) ZEND_ARG_INFO(0, sql_text) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_set_prefetch, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, number_of_rows) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_password_change, 0, 0, 4) ZEND_ARG_INFO(0, connection_resource_or_connection_string) ZEND_ARG_INFO(0, username) @@ -392,65 +445,79 @@ ZEND_ARG_INFO(0, new_password) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_cursor, 0, 0, 1) ZEND_ARG_INFO(0, connection_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_result, 0, 0, 2) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_INFO(0, column_number_or_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_server_version, 0, 0, 1) ZEND_ARG_INFO(0, connection_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_statement_type, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_num_rows, 0, 0, 1) ZEND_ARG_INFO(0, statement_resource) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_free_collection, 0, 0, 1) ZEND_ARG_INFO(0, collection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append, 0, 0, 2) ZEND_ARG_INFO(0, collection) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_get, 0, 0, 2) ZEND_ARG_INFO(0, collection) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_assign, 0, 0, 2) ZEND_ARG_INFO(0, collection_to) ZEND_ARG_INFO(0, collection_from) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_assign, 0, 0, 3) ZEND_ARG_INFO(0, collection) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_size, 0, 0, 1) ZEND_ARG_INFO(0, collection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_max, 0, 0, 1) ZEND_ARG_INFO(0, collection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim, 0, 0, 2) ZEND_ARG_INFO(0, collection) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_collection, 0, 0, 2) ZEND_ARG_INFO(0, connection_resource) ZEND_ARG_INFO(0, type_name) @@ -459,113 +526,141 @@ /* }}} */ /* {{{ LOB Method arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_save_method, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_import_method, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_load_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_read_method, 0, 0, 1) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_eof_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_tell_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_rewind_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_seek_method, 0, 0, 1) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, whence) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_size_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_method, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_append_method, 0, 0, 1) ZEND_ARG_INFO(0, lob_descriptor_from) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_truncate_method, 0, 0, 0) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_erase_method, 0, 0, 0) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_flush_method, 0, 0, 0) ZEND_ARG_INFO(0, flag) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_setbuffering_method, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_getbuffering_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_export_method, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, start) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_temporary_method, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_close_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_free_descriptor_method, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ Collection Method arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_free_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append_method, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_get_method, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_assign_method, 0, 0, 1) ZEND_ARG_INFO(0, collection_from) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_assign_method, 0, 0, 2) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_size_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_max_method, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim_method, 0, 0, 1) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() @@ -1218,7 +1313,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); php_info_print_table_row(2, "Version", PHP_OCI8_VERSION); - php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.24 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.38.2.25 $"); snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.13.2.2.2.2.2.5&r2=1.13.2.2.2.2.2.6&diff_format=u Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.5 php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.6 --- php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.5 Fri Oct 24 14:35:36 2008 +++ php-src/ext/odbc/birdstep.c Sun Nov 2 21:19:34 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.13.2.2.2.2.2.5 2008/10/24 14:35:36 felipe Exp $ */ +/* $Id: birdstep.c,v 1.13.2.2.2.2.2.6 2008/11/02 21:19:34 felipe Exp $ */ /* * TODO: @@ -50,55 +50,67 @@ #include "php_ini.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_connect, 0, 0, 3) ZEND_ARG_INFO(0, server) ZEND_ARG_INFO(0, user) ZEND_ARG_INFO(0, pass) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_close, 0, 0, 1) ZEND_ARG_INFO(0, id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_exec, 0, 0, 2) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, exec_str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fetch, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_result, 0, 0, 2) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_freeresult, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_autocommit, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_off_autocommit, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_commit, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_rollback, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldname, 0, 0, 2) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, col) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldnum, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.9&r2=1.189.2.4.2.7.2.10&diff_format=u Index: php-src/ext/odbc/php_odbc.c diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.9 php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.10 --- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.9 Fri Oct 24 14:35:36 2008 +++ php-src/ext/odbc/php_odbc.c Sun Nov 2 21:19:34 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.9 2008/10/24 14:35:36 felipe Exp $ */ +/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.10 2008/11/02 21:19:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -67,40 +67,48 @@ #define SAFE_SQL_NTS(n) ((SQLSMALLINT) ((n)?(SQL_NTS):0)) /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_odbc_close_all, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_binmode, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_longreadlen, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_prepare, 0, 0, 2) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_execute, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, parameters_array) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_cursor, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_END_ARG_INFO() #ifdef HAVE_SQLDATASOURCES +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_data_source, 0, 0, 2) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, fetch_type) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_exec, 0, 0, 2) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, query) @@ -108,42 +116,50 @@ ZEND_END_ARG_INFO() #ifdef PHP_ODBC_HAVE_FETCH_HASH +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_object, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, rownumber) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_array, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, rownumber) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_into, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, result_array) ZEND_ARG_INFO(0, rownumber) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_row, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, row_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result_all, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_free_result, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_connect, 0, 0, 3) ZEND_ARG_INFO(0, dsn) ZEND_ARG_INFO(0, user) @@ -151,6 +167,7 @@ ZEND_ARG_INFO(0, cursor_option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_pconnect, 0, 0, 3) ZEND_ARG_INFO(0, dsn) ZEND_ARG_INFO(0, user) @@ -158,70 +175,85 @@ ZEND_ARG_INFO(0, cursor_option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_close, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_rows, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_END_ARG_INFO() #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_next_result, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_fields, 0, 0, 1) ZEND_ARG_INFO(0, result_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_name, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_type, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_len, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_scale, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_num, 0, 0, 2) ZEND_ARG_INFO(0, result_id) ZEND_ARG_INFO(0, field_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_autocommit, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, onoff) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_commit, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_rollback, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_error, 0, 0, 0) ZEND_ARG_INFO(0, connection_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_errormsg, 0, 0, 0) ZEND_ARG_INFO(0, connection_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_setoption, 0, 0, 4) ZEND_ARG_INFO(0, conn_id) ZEND_ARG_INFO(0, which) @@ -229,6 +261,7 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -237,6 +270,7 @@ ZEND_ARG_INFO(0, table_types) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -245,11 +279,13 @@ ZEND_ARG_INFO(0, column_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_gettypeinfo, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, data_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -259,6 +295,7 @@ #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) #if !defined(HAVE_BIRDSTEP) +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -268,6 +305,7 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -275,6 +313,7 @@ ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_foreignkeys, 0, 0, 7) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, pk_qualifier) @@ -286,6 +325,7 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, type) @@ -296,6 +336,7 @@ ZEND_ARG_INFO(0, nullable) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -306,6 +347,7 @@ ZEND_END_ARG_INFO() #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP) +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -313,6 +355,7 @@ ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columnprivileges, 0, 0, 5) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, catalog) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.22&r2=1.98.2.5.2.41.2.23&diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.22 php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.23 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.22 Sun Oct 26 14:35:41 2008 +++ php-src/ext/openssl/openssl.c Sun Nov 2 21:19:34 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.98.2.5.2.41.2.22 2008/10/26 14:35:41 iliaa Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.41.2.23 2008/11/02 21:19:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -96,28 +96,33 @@ PHP_FUNCTION(openssl_dh_compute_key); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_export_to_file, 0, 0, 2) ZEND_ARG_INFO(0, x509) ZEND_ARG_INFO(0, outfilename) ZEND_ARG_INFO(0, notext) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_export, 0, 0, 2) ZEND_ARG_INFO(0, x509) ZEND_ARG_INFO(1, out) ZEND_ARG_INFO(0, notext) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_check_private_key, 0) ZEND_ARG_INFO(0, cert) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_parse, 0) ZEND_ARG_INFO(0, x509) ZEND_ARG_INFO(0, shortname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_checkpurpose, 0, 0, 3) ZEND_ARG_INFO(0, x509cert) ZEND_ARG_INFO(0, purpose) @@ -125,14 +130,17 @@ ZEND_ARG_INFO(0, untrustedfile) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_read, 0) ZEND_ARG_INFO(0, cert) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_free, 0) ZEND_ARG_INFO(0, x509) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs12_export_to_file, 0, 0, 4) ZEND_ARG_INFO(0, x509) ZEND_ARG_INFO(0, filename) @@ -141,6 +149,7 @@ ZEND_ARG_INFO(0, args) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkcs12_export, 0) ZEND_ARG_INFO(0, x509) ZEND_ARG_INFO(1, out) @@ -149,24 +158,28 @@ ZEND_ARG_INFO(0, args) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkcs12_read, 0) ZEND_ARG_INFO(0, PKCS12) ZEND_ARG_INFO(1, certs) /* array */ ZEND_ARG_INFO(0, pass) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_export_to_file, 0, 0, 2) ZEND_ARG_INFO(0, csr) ZEND_ARG_INFO(0, outfilename) ZEND_ARG_INFO(0, notext) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_export, 0, 0, 2) ZEND_ARG_INFO(0, csr) ZEND_ARG_INFO(1, out) ZEND_ARG_INFO(0, notext) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_sign, 0, 0, 4) ZEND_ARG_INFO(0, csr) ZEND_ARG_INFO(0, x509) @@ -176,6 +189,7 @@ ZEND_ARG_INFO(0, serial) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_new, 0, 0, 2) ZEND_ARG_INFO(0, dn) /* array */ ZEND_ARG_INFO(1, privkey) @@ -183,18 +197,22 @@ ZEND_ARG_INFO(0, extraattribs) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_csr_get_subject, 0) ZEND_ARG_INFO(0, csr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_csr_get_public_key, 0) ZEND_ARG_INFO(0, csr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_new, 0, 0, 0) ZEND_ARG_INFO(0, configargs) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_export_to_file, 0, 0, 2) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, outfilename) @@ -202,6 +220,7 @@ ZEND_ARG_INFO(0, config_args) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_export, 0, 0, 2) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(1, out) @@ -209,23 +228,28 @@ ZEND_ARG_INFO(0, config_args) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_get_public, 0) ZEND_ARG_INFO(0, cert) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_free, 0) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_get_private, 0, 0, 1) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, passphrase) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_get_details, 0) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_verify, 0, 0, 2) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, flags) @@ -235,6 +259,7 @@ ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_encrypt, 0, 0, 4) ZEND_ARG_INFO(0, infile) ZEND_ARG_INFO(0, outfile) @@ -244,6 +269,7 @@ ZEND_ARG_INFO(0, cipher) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_sign, 0, 0, 5) ZEND_ARG_INFO(0, infile) ZEND_ARG_INFO(0, outfile) @@ -254,6 +280,7 @@ ZEND_ARG_INFO(0, extracertsfilename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_decrypt, 0, 0, 3) ZEND_ARG_INFO(0, infilename) ZEND_ARG_INFO(0, outfilename) @@ -261,6 +288,7 @@ ZEND_ARG_INFO(0, recipkey) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_private_encrypt, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, crypted) @@ -268,6 +296,7 @@ ZEND_ARG_INFO(0, padding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_private_decrypt, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, crypted) @@ -275,6 +304,7 @@ ZEND_ARG_INFO(0, padding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_public_encrypt, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, crypted) @@ -282,6 +312,7 @@ ZEND_ARG_INFO(0, padding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_public_decrypt, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, crypted) @@ -289,9 +320,11 @@ ZEND_ARG_INFO(0, padding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_error_string, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_sign, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, signature) @@ -299,6 +332,7 @@ ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_verify, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, signature) @@ -306,6 +340,7 @@ ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_seal, 0) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, sealdata) @@ -313,6 +348,7 @@ ZEND_ARG_INFO(0, pubkeys) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_open, 0) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, opendata) @@ -320,20 +356,24 @@ ZEND_ARG_INFO(0, privkey) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_get_md_methods, 0, 0, 0) ZEND_ARG_INFO(0, aliases) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_get_cipher_methods, 0, 0, 0) ZEND_ARG_INFO(0, aliases) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_digest, 0, 0, 2) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, method) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_encrypt, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, method) @@ -341,6 +381,7 @@ ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_decrypt, 0, 0, 3) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, method) @@ -348,6 +389,7 @@ ZEND_ARG_INFO(0, raw_input) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openssl_dh_compute_key, 0) ZEND_ARG_INFO(0, pub_key) ZEND_ARG_INFO(0, dh_key) http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.11&r2=1.48.2.2.2.4.2.12&diff_format=u Index: php-src/ext/pcntl/pcntl.c diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.11 php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.12 --- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.11 Fri Oct 24 14:35:36 2008 +++ php-src/ext/pcntl/pcntl.c Sun Nov 2 21:19:34 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcntl.c,v 1.48.2.2.2.4.2.11 2008/10/24 14:35:36 felipe Exp $ */ +/* $Id: pcntl.c,v 1.48.2.2.2.4.2.12 2008/11/02 21:19:34 felipe Exp $ */ #define PCNTL_DEBUG 0 @@ -48,36 +48,43 @@ static PHP_GINIT_FUNCTION(pcntl); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_pcntl_void, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_waitpid, 0, 0, 2) ZEND_ARG_INFO(0, pid) ZEND_ARG_INFO(1, status) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wait, 0, 0, 1) ZEND_ARG_INFO(1, status) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_signal, 0, 0, 2) ZEND_ARG_INFO(0, signo) ZEND_ARG_INFO(0, handler) ZEND_ARG_INFO(0, restart_syscalls) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_sigprocmask, 0, 0, 2) ZEND_ARG_INFO(0, how) ZEND_ARG_INFO(0, set) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_sigwaitinfo, 0, 0, 1) ZEND_ARG_INFO(0, set) ZEND_ARG_INFO(1, info) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_sigtimedwait, 0, 0, 1) ZEND_ARG_INFO(0, set) ZEND_ARG_INFO(1, info) @@ -85,41 +92,50 @@ ZEND_ARG_INFO(0, nanoseconds) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifexited, 0, 0, 1) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifstopped, 0, 0, 1) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifsignaled, 0, 0, 1) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifexitstatus, 0, 0, 1) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wtermsig, 0, 0, 1) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wstopsig, 0, 0, 1) ZEND_ARG_INFO(0, status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_exec, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, args) ZEND_ARG_INFO(0, envs) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_alarm, 0, 0, 1) ZEND_ARG_INFO(0, seconds) ZEND_END_ARG_INFO() #ifdef HAVE_GETPRIORITY +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_getpriority, 0, 0, 0) ZEND_ARG_INFO(0, pid) ZEND_ARG_INFO(0, process_identifier) @@ -127,6 +143,7 @@ #endif #ifdef HAVE_SETPRIORITY +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_setpriority, 0, 0, 1) ZEND_ARG_INFO(0, priority) ZEND_ARG_INFO(0, pid) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.26&r2=1.168.2.9.2.21.2.27&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.26 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.27 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.26 Fri Oct 24 14:35:36 2008 +++ php-src/ext/pcre/php_pcre.c Sun Nov 2 21:19:34 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.26 2008/10/24 14:35:36 felipe Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.27 2008/11/02 21:19:34 felipe Exp $ */ #include "php.h" #include "php_ini.h" @@ -1819,6 +1819,7 @@ /* {{{ module definition structures */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, subject) @@ -1827,6 +1828,7 @@ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 3) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, subject) @@ -1835,6 +1837,7 @@ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, replace) @@ -1843,6 +1846,7 @@ ZEND_ARG_INFO(1, count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace_callback, 0, 0, 3) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, callback) @@ -1851,6 +1855,7 @@ ZEND_ARG_INFO(1, count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_split, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, subject) @@ -1858,17 +1863,20 @@ ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_quote, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, delim_char) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_grep, 0, 0, 2) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, input) /* array */ ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_preg_last_error, 0) ZEND_END_ARG_INFO() /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/007.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/pcre/tests/007.phpt diff -u php-src/ext/pcre/tests/007.phpt:1.1.2.1 php-src/ext/pcre/tests/007.phpt:1.1.2.2 --- php-src/ext/pcre/tests/007.phpt:1.1.2.1 Sat Mar 8 11:50:20 2008 +++ php-src/ext/pcre/tests/007.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- preg_replace_callback() with callback that modifies subject string ---SKIPIF-- -<?php -if (@preg_match('/./u', '') === false) { - die('skip no utf8 support in PCRE library'); -} -?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/backtrack_limit.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/pcre/tests/backtrack_limit.phpt diff -u php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.2 php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.2.2.1 --- php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.2 Mon Feb 12 14:22:19 2007 +++ php-src/ext/pcre/tests/backtrack_limit.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- Backtracking limit ---SKIPIF-- -<?php -if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) { - die("skip no support for \p support PCRE library"); -} -?> --INI-- pcre.backtrack_limit=2 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug27103.phpt?r1=1.1.6.1&r2=1.1.6.1.2.1&diff_format=u Index: php-src/ext/pcre/tests/bug27103.phpt diff -u php-src/ext/pcre/tests/bug27103.phpt:1.1.6.1 php-src/ext/pcre/tests/bug27103.phpt:1.1.6.1.2.1 --- php-src/ext/pcre/tests/bug27103.phpt:1.1.6.1 Mon Feb 12 14:22:19 2007 +++ php-src/ext/pcre/tests/bug27103.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- Bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into octets) ---SKIPIF-- -<?php -if (@preg_match_all('/./u', "", $matches) === false) { - die("skip no utf8 support in PCRE library"); -} -?> --FILE-- <?php function iter($ar) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u Index: php-src/ext/pcre/tests/invalid_utf8.phpt diff -u php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.3 php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.3.2.1 --- php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.3 Mon Feb 12 14:22:19 2007 +++ php-src/ext/pcre/tests/invalid_utf8.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- preg_replace() and invalid UTF8 ---SKIPIF-- -<?php -if (@preg_match_all('/./u', "", $matches) === false) { - die("skip no utf8 support in PCRE library"); -} -?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8_offset.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/pcre/tests/invalid_utf8_offset.phpt diff -u php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.1.2.1 php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.1.2.2 --- php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.1.2.1 Sat Mar 8 11:50:20 2008 +++ php-src/ext/pcre/tests/invalid_utf8_offset.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- preg_replace() and invalid UTF8 offset ---SKIPIF-- -<?php -if (@preg_match('/./u', '') === false) { - die('skip no utf8 support in PCRE library'); -} -?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/locales.phpt?r1=1.1.2.4&r2=1.1.2.4.2.1&diff_format=u Index: php-src/ext/pcre/tests/locales.phpt diff -u php-src/ext/pcre/tests/locales.phpt:1.1.2.4 php-src/ext/pcre/tests/locales.phpt:1.1.2.4.2.1 --- php-src/ext/pcre/tests/locales.phpt:1.1.2.4 Mon Jul 3 13:04:45 2006 +++ php-src/ext/pcre/tests/locales.phpt Sun Nov 2 21:19:35 2008 @@ -1,8 +1,5 @@ --TEST-- Localized match ---SKIPIF-- -<?php if (!function_exists('setlocale')) die('skip: setlocale() not available'); ?> -<?php if (!@setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) die('skip pt locale not available'); --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_anchored.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/pcre/tests/pcre_anchored.phpt diff -u php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.2 php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.2.2.1 --- php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.2 Mon Feb 12 14:22:19 2007 +++ php-src/ext/pcre/tests/pcre_anchored.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- A (PCRE_ANCHORED) modififer ---SKIPIF-- -<?php -if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) { - die("skip no support for \p support PCRE library"); -} -?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace2.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u Index: php-src/ext/pcre/tests/preg_replace2.phpt diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.3 php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.3.2.1 --- php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.3 Mon Feb 12 14:22:19 2007 +++ php-src/ext/pcre/tests/preg_replace2.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- preg_replace() ---SKIPIF-- -<?php -if (@preg_match_all('/./u', "", $matches) === false) { - die("skip no utf8 support in PCRE library"); -} -?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/recursion_limit.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/pcre/tests/recursion_limit.phpt diff -u php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.2 php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.2.2.1 --- php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.2 Mon Feb 12 14:22:19 2007 +++ php-src/ext/pcre/tests/recursion_limit.phpt Sun Nov 2 21:19:35 2008 @@ -1,11 +1,5 @@ --TEST-- PCRE Recursion limit ---SKIPIF-- -<?php -if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) { - die("skip no support for \p support PCRE library"); -} -?> --INI-- pcre.recursion_limit=2 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.9.2.5&r2=1.57.2.17.2.9.2.6&diff_format=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.9.2.5 php-src/ext/pdo/pdo.c:1.57.2.17.2.9.2.6 --- php-src/ext/pdo/pdo.c:1.57.2.17.2.9.2.5 Fri Oct 24 14:35:37 2008 +++ php-src/ext/pdo/pdo.c Sun Nov 2 21:19:35 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.57.2.17.2.9.2.5 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: pdo.c,v 1.57.2.17.2.9.2.6 2008/11/02 21:19:35 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -118,6 +118,7 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_pdo_drivers, 0) ZEND_END_ARG_INFO() /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.29&r2=1.118.2.38.2.24.2.30&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.29 php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.30 --- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.29 Fri Oct 24 14:35:37 2008 +++ php-src/ext/pdo/pdo_stmt.c Sun Nov 2 21:19:35 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.29 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.30 2008/11/02 21:19:35 felipe Exp $ */ /* The PDO Statement Handle Class */ @@ -38,37 +38,44 @@ #include "php_memory_streams.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_execute, 0, 0, 0) ZEND_ARG_INFO(0, bound_input_params) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetch, 0, 0, 0) ZEND_ARG_INFO(0, how) ZEND_ARG_INFO(0, orientation) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchobject, 0, 0, 0) ZEND_ARG_INFO(0, class_name) ZEND_ARG_INFO(0, ctor_args) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchcolumn, 0, 0, 0) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchall, 0, 0, 0) ZEND_ARG_INFO(0, how) ZEND_ARG_INFO(0, class_name) ZEND_ARG_INFO(0, ctor_args) /* array */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindvalue, 0, 0, 2) ZEND_ARG_INFO(0, paramno) ZEND_ARG_INFO(0, param) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindparam, 0, 0, 2) ZEND_ARG_INFO(0, paramno) ZEND_ARG_INFO(1, param) @@ -77,6 +84,7 @@ ZEND_ARG_INFO(0, driverdata) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindcolumn, 0, 0, 2) ZEND_ARG_INFO(0, column) ZEND_ARG_INFO(1, param) @@ -85,19 +93,23 @@ ZEND_ARG_INFO(0, driverdata) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_setattribute, 0) ZEND_ARG_INFO(0, attribute) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_getattribute, 0) ZEND_ARG_INFO(0, attribute) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_getcolumnmeta, 0) ZEND_ARG_INFO(0, column) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_setfetchmode, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, params) http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24.2.20&r2=1.331.2.13.2.24.2.21&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.20 php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.21 --- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.20 Fri Oct 24 14:35:37 2008 +++ php-src/ext/pgsql/pgsql.c Sun Nov 2 21:19:35 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.331.2.13.2.24.2.20 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: pgsql.c,v 1.331.2.13.2.24.2.21 2008/11/02 21:19:35 felipe Exp $ */ #include <stdlib.h> @@ -90,6 +90,7 @@ static PHP_GINIT_FUNCTION(pgsql); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connect, 0, 0, 1) ZEND_ARG_INFO(0, connection_string) ZEND_ARG_INFO(0, connect_type) @@ -100,6 +101,7 @@ ZEND_ARG_INFO(0, database) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_pconnect, 0, 0, 1) ZEND_ARG_INFO(0, connection_string) ZEND_ARG_INFO(0, host) @@ -110,54 +112,66 @@ ZEND_END_ARG_INFO() #if HAVE_PQPARAMETERSTATUS +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_parameter_status, 0, 0, 1) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, param_name) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_close, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_dbname, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_last_error, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_options, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_port, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_tty, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_host, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_version, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_ping, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_query, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() #if HAVE_PQEXECPARAMS +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_query_params, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, query) @@ -166,6 +180,7 @@ #endif #if HAVE_PQPREPARE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_prepare, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, stmtname) @@ -174,6 +189,7 @@ #endif #if HAVE_PQEXECPREPARED +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_execute, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, stmtname) @@ -181,25 +197,30 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_num_rows, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_num_fields, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #if HAVE_PQCMDTUPLES +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_affected_rows, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_last_notice, 0, 0, 1) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() #ifdef HAVE_PQFTABLE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_table, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_number) @@ -207,54 +228,64 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_name, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_size, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_type, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_type_oid, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_num, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_result, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row_number) ZEND_ARG_INFO(0, field_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_row, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_assoc, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_array, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_object, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) @@ -263,108 +294,129 @@ ZEND_ARG_INFO(0, ctor_params) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_all, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_all_columns, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_seek, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_prtlen, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_ARG_INFO(0, field_name_or_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_is_null, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_ARG_INFO(0, field_name_or_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_free_result, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_last_oid, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_trace, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_untrace, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_create, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, large_object_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_unlink, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, large_object_oid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_open, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, large_object_oid) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_close, 0, 0, 1) ZEND_ARG_INFO(0, large_object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_read, 0, 0, 1) ZEND_ARG_INFO(0, large_object) ZEND_ARG_INFO(0, len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_write, 0, 0, 2) ZEND_ARG_INFO(0, large_object) ZEND_ARG_INFO(0, buf) ZEND_ARG_INFO(0, len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_read_all, 0, 0, 1) ZEND_ARG_INFO(0, large_object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_import, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, large_object_oid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_export, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, objoid) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_seek, 0, 0, 2) ZEND_ARG_INFO(0, large_object) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, whence) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_tell, 0, 0, 1) ZEND_ARG_INFO(0, large_object) ZEND_END_ARG_INFO() #if HAVE_PQSETERRORVERBOSITY +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_set_error_verbosity, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, verbosity) @@ -372,25 +424,30 @@ #endif #if HAVE_PQCLIENTENCODING +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_set_client_encoding, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_client_encoding, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_end_copy, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_put_line, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_copy_to, 0, 0, 2) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, table_name) @@ -398,6 +455,7 @@ ZEND_ARG_INFO(0, null_as) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_copy_from, 0, 0, 3) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, table_name) @@ -407,60 +465,72 @@ ZEND_END_ARG_INFO() #if HAVE_PQESCAPE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_escape_string, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_escape_bytea, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_unescape_bytea, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_error, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #if HAVE_PQRESULTERRORFIELD +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_error_field, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, fieldcode) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connection_status, 0, 0, 1) ZEND_ARG_INFO(0, connnection) ZEND_END_ARG_INFO() #if HAVE_PGTRANSACTIONSTATUS +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_transaction_status, 0, 0, 1) ZEND_ARG_INFO(0, connnection) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connection_reset, 0, 0, 1) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_cancel_query, 0, 0, 1) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connection_busy, 0, 0, 1) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_query, 0, 0, 2) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() #if HAVE_PQSENDQUERYPARAMS +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_query_params, 0, 0, 3) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, query) @@ -469,6 +539,7 @@ #endif #if HAVE_PQSENDPREPARE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_prepare, 0, 0, 3) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, stmtname) @@ -477,6 +548,7 @@ #endif #if HAVE_PQSENDQUERYPREPARED +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_execute, 0, 0, 3) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, stmtname) @@ -484,29 +556,35 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_get_result, 0, 0, 1) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_status, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_get_notify, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_ARG_INFO(0, e) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_get_pid, 0, 0, 0) ZEND_ARG_INFO(0, connection) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_meta_data, 0, 0, 2) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, table) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_convert, 0, 0, 3) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, table) @@ -514,6 +592,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_insert, 0, 0, 3) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, table) @@ -521,6 +600,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_update, 0, 0, 4) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, table) @@ -529,6 +609,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_delete, 0, 0, 3) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, table) @@ -536,6 +617,7 @@ ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_select, 0, 0, 3) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, table) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.54&r2=1.266.2.55&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.54 php-src/ext/phar/phar_object.c:1.266.2.55 --- php-src/ext/phar/phar_object.c:1.266.2.54 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/phar_object.c Sun Nov 2 21:19:35 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar_object.c,v 1.266.2.54 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: phar_object.c,v 1.266.2.55 2008/11/02 21:19:35 felipe Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -4954,6 +4954,7 @@ /* {{{ phar methods */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar___construct, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, flags) @@ -4961,30 +4962,36 @@ ZEND_ARG_INFO(0, fileformat) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_createDS, 0, 0, 0) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, webindex) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_loadPhar, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, alias) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mapPhar, 0, 0, 0) ZEND_ARG_INFO(0, alias) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mount, 0, 0, 2) ZEND_ARG_INFO(0, inphar) ZEND_ARG_INFO(0, externalfile) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mungServer, 0, 0, 1) ZEND_ARG_INFO(0, munglist) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_webPhar, 0, 0, 0) ZEND_ARG_INFO(0, alias) ZEND_ARG_INFO(0, index) @@ -4993,105 +5000,127 @@ ZEND_ARG_INFO(0, rewrites) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_running, 0, 0, 1) ZEND_ARG_INFO(0, retphar) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_ua, 0, 0, 1) ZEND_ARG_INFO(0, archive) ZEND_END_ARG_INFO() #if HAVE_SPL +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_build, 0, 0, 1) ZEND_ARG_INFO(0, iterator) ZEND_ARG_INFO(0, base_directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_conv, 0, 0, 0) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, compression_type) ZEND_ARG_INFO(0, file_ext) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_comps, 0, 0, 1) ZEND_ARG_INFO(0, compression_type) ZEND_ARG_INFO(0, file_ext) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_decomp, 0, 0, 0) ZEND_ARG_INFO(0, file_ext) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_comp, 0, 0, 1) ZEND_ARG_INFO(0, compression_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_compo, 0, 0, 0) ZEND_ARG_INFO(0, compression_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_copy, 0, 0, 2) ZEND_ARG_INFO(0, newfile) ZEND_ARG_INFO(0, oldfile) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_delete, 0, 0, 1) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_fromdir, 0, 0, 1) ZEND_ARG_INFO(0, base_dir) ZEND_ARG_INFO(0, regex) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_offsetExists, 0, 0, 1) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_offsetSet, 0, 0, 2) ZEND_ARG_INFO(0, entry) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setAlias, 0, 0, 1) ZEND_ARG_INFO(0, alias) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setMetadata, 0, 0, 1) ZEND_ARG_INFO(0, metadata) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setSigAlgo, 0, 0, 1) ZEND_ARG_INFO(0, algorithm) ZEND_ARG_INFO(0, privatekey) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setStub, 0, 0, 1) ZEND_ARG_INFO(0, newstub) ZEND_ARG_INFO(0, maxlen) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_emptydir, 0, 0, 0) ZEND_ARG_INFO(0, dirname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_extract, 0, 0, 1) ZEND_ARG_INFO(0, pathto) ZEND_ARG_INFO(0, files) ZEND_ARG_INFO(0, overwrite) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_addfile, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, localname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_fromstring, 0, 0, 1) ZEND_ARG_INFO(0, localname) ZEND_ARG_INFO(0, contents) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_isff, 0, 0, 1) ZEND_ARG_INFO(0, fileformat) ZEND_END_ARG_INFO() @@ -5164,10 +5193,12 @@ }; #if HAVE_SPL +static ZEND_BEGIN_ARG_INFO_EX(arginfo_entry___construct, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_entry_chmod, 0, 0, 1) ZEND_ARG_INFO(0, perms) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.16.2.11&r2=1.70.2.3.2.16.2.12&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.70.2.3.2.16.2.11 php-src/ext/posix/posix.c:1.70.2.3.2.16.2.12 --- php-src/ext/posix/posix.c:1.70.2.3.2.16.2.11 Fri Oct 24 14:35:37 2008 +++ php-src/ext/posix/posix.c Sun Nov 2 21:19:35 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.70.2.3.2.16.2.11 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: posix.c,v 1.70.2.3.2.16.2.12 2008/11/02 21:19:35 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,107 +57,132 @@ static PHP_MINFO_FUNCTION(posix); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_kill, 0, 0, 2) ZEND_ARG_INFO(0, pid) ZEND_ARG_INFO(0, sig) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getpid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getppid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getuid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setuid, 0, 0, 1) ZEND_ARG_INFO(0, uid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_posix_geteuid, 0) ZEND_END_ARG_INFO() #ifdef HAVE_SETEUID +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_seteuid, 0, 0, 1) ZEND_ARG_INFO(0, uid) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getgid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setgid, 0, 0, 1) ZEND_ARG_INFO(0, gid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getegid, 0) ZEND_END_ARG_INFO() #ifdef HAVE_SETEGID +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setegid, 0, 0, 1) ZEND_ARG_INFO(0, gid) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GETGROUPS +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getgroups, 0) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GETLOGIN +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getlogin, 0) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getpgrp, 0) ZEND_END_ARG_INFO() #ifdef HAVE_SETSID +static ZEND_BEGIN_ARG_INFO(arginfo_posix_setsid, 0) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setpgid, 0, 0, 2) ZEND_ARG_INFO(0, pid) ZEND_ARG_INFO(0, pgid) ZEND_END_ARG_INFO() #ifdef HAVE_GETPGID +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getpgid, 0, 0, 1) ZEND_ARG_INFO(0, pid) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GETSID +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getsid, 0, 0, 1) ZEND_ARG_INFO(0, pid) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_posix_uname, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_posix_times, 0) ZEND_END_ARG_INFO() #ifdef HAVE_CTERMID +static ZEND_BEGIN_ARG_INFO(arginfo_posix_ctermid, 0) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_ttyname, 0, 0, 1) ZEND_ARG_INFO(0, fd) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_isatty, 0, 0, 1) ZEND_ARG_INFO(0, fd) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getcwd, 0) ZEND_END_ARG_INFO() #ifdef HAVE_MKFIFO +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_mkfifo, 0, 0, 2) ZEND_ARG_INFO(0, pathname) ZEND_ARG_INFO(0, mode) @@ -165,6 +190,7 @@ #endif #ifdef HAVE_MKNOD +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_mknod, 0, 0, 2) ZEND_ARG_INFO(0, pathname) ZEND_ARG_INFO(0, mode) @@ -173,40 +199,49 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_access, 0, 0, 1) ZEND_ARG_INFO(0, file) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getgrnam, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getgrgid, 0, 0, 1) ZEND_ARG_INFO(0, gid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getpwnam, 0, 0, 1) ZEND_ARG_INFO(0, username) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getpwuid, 0, 0, 1) ZEND_ARG_INFO(0, uid) ZEND_END_ARG_INFO() #ifdef HAVE_GETRLIMIT +static ZEND_BEGIN_ARG_INFO(arginfo_posix_getrlimit, 0) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_posix_get_last_error, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_strerror, 0, 0, 1) ZEND_ARG_INFO(0, errno) ZEND_END_ARG_INFO() #ifdef HAVE_INITGROUPS +static ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_initgroups, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, base_group_id) @@ -310,7 +345,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16.2.11 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16.2.12 $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/pspell.c?r1=1.45.2.4.2.7.2.7&r2=1.45.2.4.2.7.2.8&diff_format=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.45.2.4.2.7.2.7 php-src/ext/pspell/pspell.c:1.45.2.4.2.7.2.8 --- php-src/ext/pspell/pspell.c:1.45.2.4.2.7.2.7 Fri Oct 24 14:35:37 2008 +++ php-src/ext/pspell/pspell.c Sun Nov 2 21:19:35 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.45.2.4.2.7.2.7 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: pspell.c,v 1.45.2.4.2.7.2.8 2008/11/02 21:19:35 felipe Exp $ */ #define IS_EXT_MODULE @@ -73,6 +73,7 @@ static PHP_FUNCTION(pspell_config_save_repl); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new, 0, 0, 1) ZEND_ARG_INFO(0, language) ZEND_ARG_INFO(0, spelling) @@ -81,6 +82,7 @@ ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_personal, 0, 0, 2) ZEND_ARG_INFO(0, personal) ZEND_ARG_INFO(0, language) @@ -90,44 +92,53 @@ ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_config, 0, 0, 1) ZEND_ARG_INFO(0, config) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_check, 0, 0, 2) ZEND_ARG_INFO(0, pspell) ZEND_ARG_INFO(0, word) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_suggest, 0, 0, 2) ZEND_ARG_INFO(0, pspell) ZEND_ARG_INFO(0, word) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_store_replacement, 0, 0, 3) ZEND_ARG_INFO(0, pspell) ZEND_ARG_INFO(0, misspell) ZEND_ARG_INFO(0, correct) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_personal, 0, 0, 2) ZEND_ARG_INFO(0, pspell) ZEND_ARG_INFO(0, word) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_session, 0, 0, 2) ZEND_ARG_INFO(0, pspell) ZEND_ARG_INFO(0, word) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_clear_session, 0, 0, 1) ZEND_ARG_INFO(0, pspell) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_save_wordlist, 0, 0, 1) ZEND_ARG_INFO(0, pspell) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_create, 0, 0, 1) ZEND_ARG_INFO(0, language) ZEND_ARG_INFO(0, spelling) @@ -135,41 +146,49 @@ ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_runtogether, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, runtogether) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_mode, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_ignore, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, ignore) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_personal, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, personal) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_dict_dir, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_data_dir, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_repl, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, repl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_save_repl, 0, 0, 2) ZEND_ARG_INFO(0, conf) ZEND_ARG_INFO(0, save) http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.3.2.7&r2=1.42.2.3.2.3.2.8&diff_format=u Index: php-src/ext/readline/readline.c diff -u php-src/ext/readline/readline.c:1.42.2.3.2.3.2.7 php-src/ext/readline/readline.c:1.42.2.3.2.3.2.8 --- php-src/ext/readline/readline.c:1.42.2.3.2.3.2.7 Fri Oct 24 14:35:37 2008 +++ php-src/ext/readline/readline.c Sun Nov 2 21:19:35 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.42.2.3.2.3.2.7 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: readline.c,v 1.42.2.3.2.3.2.8 2008/11/02 21:19:35 felipe Exp $ */ /* {{{ includes & prototypes */ @@ -69,54 +69,67 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readline, 0, 0, 0) ZEND_ARG_INFO(0, prompt) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_info, 0, 0, 0) ZEND_ARG_INFO(0, varname) ZEND_ARG_INFO(0, newvalue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_add_history, 0, 0, 1) ZEND_ARG_INFO(0, prompt) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_readline_clear_history, 0) ZEND_END_ARG_INFO() #ifndef HAVE_LIBEDIT +static ZEND_BEGIN_ARG_INFO(arginfo_readline_list_history, 0) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_read_history, 0, 0, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_write_history, 0, 0, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_completion_function, 0, 0, 1) ZEND_ARG_INFO(0, funcname) ZEND_END_ARG_INFO() #if HAVE_RL_CALLBACK_READ_CHAR +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_callback_handler_install, 0, 0, 2) ZEND_ARG_INFO(0, prompt) ZEND_ARG_INFO(0, callback) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_readline_callback_read_char, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_readline_callback_handler_remove, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_readline_redisplay, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_readline_on_new_line, 0) ZEND_END_ARG_INFO() #endif http://cvs.php.net/viewvc.cgi/php-src/ext/recode/recode.c?r1=1.37.2.1.2.3.2.5&r2=1.37.2.1.2.3.2.6&diff_format=u Index: php-src/ext/recode/recode.c diff -u php-src/ext/recode/recode.c:1.37.2.1.2.3.2.5 php-src/ext/recode/recode.c:1.37.2.1.2.3.2.6 --- php-src/ext/recode/recode.c:1.37.2.1.2.3.2.5 Fri Oct 24 14:35:37 2008 +++ php-src/ext/recode/recode.c Sun Nov 2 21:19:35 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.37.2.1.2.3.2.5 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: recode.c,v 1.37.2.1.2.3.2.6 2008/11/02 21:19:35 felipe Exp $ */ /* {{{ includes & prototypes */ @@ -67,11 +67,13 @@ static PHP_GINIT_FUNCTION(recode); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_string, 0, 0, 2) ZEND_ARG_INFO(0, request) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_file, 0, 0, 3) ZEND_ARG_INFO(0, request) ZEND_ARG_INFO(0, input) @@ -135,7 +137,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.37.2.1.2.3.2.5 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.37.2.1.2.3.2.6 $"); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.37&r2=1.164.2.33.2.45.2.38&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.37 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.38 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.37 Wed Oct 29 12:56:28 2008 +++ php-src/ext/reflection/php_reflection.c Sun Nov 2 21:19:35 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.37 2008/10/29 12:56:28 felipe Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.38 2008/11/02 21:19:35 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -4790,10 +4790,12 @@ }; +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_getModifierNames, 0) ZEND_ARG_INFO(0, modifiers) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_export, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, reflector, Reflector, 0) ZEND_ARG_INFO(0, return) @@ -4811,19 +4813,23 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_function_export, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_function___construct, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_function_invoke, 0) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_function_invokeArgs, 0) ZEND_ARG_ARRAY_INFO(0, args, 0) ZEND_END_ARG_INFO() @@ -4863,22 +4869,26 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_method_export, 0, 0, 2) ZEND_ARG_INFO(0, class) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_method___construct, 0, 0, 1) ZEND_ARG_INFO(0, class_or_method) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_invoke, 0) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_invokeArgs, 0) ZEND_ARG_INFO(0, object) ZEND_ARG_ARRAY_INFO(0, args, 0) @@ -4906,73 +4916,90 @@ }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_export, 0, 0, 1) ZEND_ARG_INFO(0, argument) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class___construct, 0) ZEND_ARG_INFO(0, argument) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getStaticPropertyValue, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, default) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_setStaticPropertyValue, 0) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasMethod, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getMethod, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getMethods, 0, 0, 0) ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasProperty, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getProperty, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getProperties, 0, 0, 0) ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasConstant, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getConstant, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_isInstance, 0) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstance, 0) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstanceArgs, 0, 0, 0) ZEND_ARG_ARRAY_INFO(0, args, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_isSubclassOf, 0) ZEND_ARG_INFO(0, class) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_implementsInterface, 0) ZEND_ARG_INFO(0, interface) ZEND_END_ARG_INFO() @@ -5026,11 +5053,13 @@ }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_object_export, 0, 0, 1) ZEND_ARG_INFO(0, argument) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_object___construct, 0) ZEND_ARG_INFO(0, argument) ZEND_END_ARG_INFO() @@ -5042,24 +5071,29 @@ }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_export, 0, 0, 1) ZEND_ARG_INFO(0, argument) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_property___construct, 0) ZEND_ARG_INFO(0, argument) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_getValue, 0, 0, 0) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_property_setValue, 0) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_property_setAccessible, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() @@ -5084,12 +5118,14 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_parameter_export, 0, 0, 2) ZEND_ARG_INFO(0, function) ZEND_ARG_INFO(0, parameter) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_parameter___construct, 0) ZEND_ARG_INFO(0, function) ZEND_ARG_INFO(0, parameter) @@ -5114,11 +5150,13 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_extension_export, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_extension___construct, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() @@ -5255,7 +5293,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.37 2008/10/29 12:56:28 felipe Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.38 2008/11/02 21:19:35 felipe Exp $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.15&r2=1.417.2.8.2.40.2.16&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.15 php-src/ext/session/session.c:1.417.2.8.2.40.2.16 --- php-src/ext/session/session.c:1.417.2.8.2.40.2.15 Fri Oct 24 14:35:37 2008 +++ php-src/ext/session/session.c Sun Nov 2 21:19:35 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.417.2.8.2.40.2.15 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: session.c,v 1.417.2.8.2.40.2.16 2008/11/02 21:19:35 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2024,46 +2024,57 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_name, 0, 0, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_module_name, 0, 0, 0) ZEND_ARG_INFO(0, module) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_save_path, 0, 0, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_id, 0, 0, 0) ZEND_ARG_INFO(0, id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_regenerate_id, 0, 0, 0) ZEND_ARG_INFO(0, delete_old_session) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_decode, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_register, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_unregister, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_is_registered, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_session_void, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_save_handler, 0, 0, 6) ZEND_ARG_INFO(0, open) ZEND_ARG_INFO(0, close) @@ -2073,14 +2084,17 @@ ZEND_ARG_INFO(0, gc) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_cache_limiter, 0, 0, 0) ZEND_ARG_INFO(0, cache_limiter) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_cache_expire, 0, 0, 0) ZEND_ARG_INFO(0, new_cache_expire) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_cookie_params, 0, 0, 1) ZEND_ARG_INFO(0, lifetime) ZEND_ARG_INFO(0, path) http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.31.2.2.2.5.2.5&r2=1.31.2.2.2.5.2.6&diff_format=u Index: php-src/ext/shmop/shmop.c diff -u php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.5 php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.6 --- php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.5 Fri Oct 24 14:35:37 2008 +++ php-src/ext/shmop/shmop.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.31.2.2.2.5.2.5 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: shmop.c,v 1.31.2.2.2.5.2.6 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,6 +46,7 @@ int shm_type; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_open, 0, 0, 4) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, flags) @@ -53,26 +54,31 @@ ZEND_ARG_INFO(0, size) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_read, 0, 0, 3) ZEND_ARG_INFO(0, shmid) ZEND_ARG_INFO(0, start) ZEND_ARG_INFO(0, count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_close, 0, 0, 1) ZEND_ARG_INFO(0, shmid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_size, 0, 0, 1) ZEND_ARG_INFO(0, shmid) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_write, 0, 0, 3) ZEND_ARG_INFO(0, shmid) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_delete, 0, 0, 1) ZEND_ARG_INFO(0, shmid) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.24&r2=1.151.2.22.2.35.2.25&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.24 php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.25 --- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.24 Fri Oct 24 14:35:37 2008 +++ php-src/ext/simplexml/simplexml.c Sun Nov 2 21:19:36 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.151.2.22.2.35.2.24 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: simplexml.c,v 1.151.2.22.2.35.2.25 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2439,6 +2439,7 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, class_name) @@ -2447,6 +2448,7 @@ ZEND_ARG_INFO(0, is_prefix) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_string, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, class_name) @@ -2455,6 +2457,7 @@ ZEND_ARG_INFO(0, is_prefix) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_import_dom, 0, 0, 1) ZEND_ARG_INFO(0, node) ZEND_ARG_INFO(0, class_name) @@ -2559,7 +2562,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.24 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.25 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.5.2.7&r2=1.106.2.2.2.5.2.8&diff_format=u Index: php-src/ext/snmp/snmp.c diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.7 php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.8 --- php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.7 Fri Oct 24 14:35:38 2008 +++ php-src/ext/snmp/snmp.c Sun Nov 2 21:19:36 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.106.2.2.2.5.2.7 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: snmp.c,v 1.106.2.2.2.5.2.8 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -113,6 +113,7 @@ static oid objid_mib[] = {1, 3, 6, 1, 2, 1}; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpget, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -121,6 +122,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpgetnext, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -129,6 +131,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpwalk, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -137,6 +140,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmprealwalk, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -145,24 +149,29 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_get_quick_print, 0, 0, 1) ZEND_ARG_INFO(0, d) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_quick_print, 0, 0, 1) ZEND_ARG_INFO(0, quick_print) ZEND_END_ARG_INFO() #ifdef HAVE_NET_SNMP +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_enum_print, 0, 0, 1) ZEND_ARG_INFO(0, enum_print) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_oid_output_format, 0, 0, 1) ZEND_ARG_INFO(0, oid_format) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpset, 0, 0, 5) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -173,6 +182,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_get, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -181,6 +191,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_getnext, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -189,6 +200,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_walk, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -197,6 +209,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_real_walk, 0, 0, 3) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -205,6 +218,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_set, 0, 0, 5) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, community) @@ -215,11 +229,13 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_php_snmpv3, 0, 0, 2) ZEND_ARG_INFO(0, s) ZEND_ARG_INFO(0, st) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_get, 0, 0, 8) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, sec_name) @@ -233,6 +249,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_getnext, 0, 0, 8) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, sec_name) @@ -246,6 +263,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_walk, 0, 0, 8) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, sec_name) @@ -259,6 +277,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_real_walk, 0, 0, 8) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, sec_name) @@ -272,6 +291,7 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_set, 0, 0, 10) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, sec_name) @@ -287,13 +307,16 @@ ZEND_ARG_INFO(0, retries) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_valueretrieval, 0, 0, 1) ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_snmp_get_valueretrieval, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_read_mib, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.25&r2=1.156.2.28.2.30.2.26&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.25 php-src/ext/soap/soap.c:1.156.2.28.2.30.2.26 --- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.25 Fri Oct 24 14:35:38 2008 +++ php-src/ext/soap/soap.c Sun Nov 2 21:19:36 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.156.2.28.2.30.2.25 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: soap.c,v 1.156.2.28.2.30.2.26 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -279,11 +279,13 @@ /* {{{ arginfo */ #ifdef ZEND_ENGINE_2 +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapparam_soapparam, 0, 0, 2) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapheader_soapheader, 0, 0, 2) ZEND_ARG_INFO(0, namespace) ZEND_ARG_INFO(0, name) @@ -292,6 +294,7 @@ ZEND_ARG_INFO(0, actor) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapfault_soapfault, 0, 0, 2) ZEND_ARG_INFO(0, faultcode) ZEND_ARG_INFO(0, faultstring) @@ -301,6 +304,7 @@ ZEND_ARG_INFO(0, headerfault) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapvar_soapvar, 0, 0, 2) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, encoding) @@ -310,6 +314,7 @@ ZEND_ARG_INFO(0, node_namespace) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_fault, 0, 0, 2) ZEND_ARG_INFO(0, code) ZEND_ARG_INFO(0, string) @@ -318,49 +323,60 @@ ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_addsoapheader, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_soapserver, 0, 0, 1) ZEND_ARG_INFO(0, wsdl) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setpersistence, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setclass, 0, 0, 1) ZEND_ARG_INFO(0, class_name) ZEND_ARG_INFO(0, args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setobject, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_soapserver_getfunctions, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_addfunction, 0, 0, 1) ZEND_ARG_INFO(0, functions) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_handle, 0, 0, 0) ZEND_ARG_INFO(0, soap_request) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient_soapclient, 0, 0, 1) ZEND_ARG_INFO(0, wsdl) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___call, 0, 0, 2) ZEND_ARG_INFO(0, function_name) ZEND_ARG_INFO(0, arguments) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___soapcall, 0, 0, 2) ZEND_ARG_INFO(0, function_name) ZEND_ARG_INFO(0, arguments) @@ -369,24 +385,31 @@ ZEND_ARG_INFO(1, output_headers) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getfunctions, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_soapclient___gettypes, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastrequest, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastresponse, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastrequestheaders, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastresponseheaders, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___dorequest, 0, 0, 4) ZEND_ARG_INFO(0, request) ZEND_ARG_INFO(0, location) @@ -395,23 +418,28 @@ ZEND_ARG_INFO(0, one_way) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setcookie, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setsoapheaders, 0, 0, 1) ZEND_ARG_INFO(0, soapheaders) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setlocation, 0, 0, 0) ZEND_ARG_INFO(0, new_location) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soap_use_soap_error_handler, 0, 0, 0) ZEND_ARG_INFO(0, handler) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_soap_is_soap_fault, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.9&r2=1.171.2.9.2.14.2.10&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.9 php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.10 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.9 Fri Oct 24 14:35:38 2008 +++ php-src/ext/sockets/sockets.c Sun Nov 2 21:19:36 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.171.2.9.2.14.2.9 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.14.2.10 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -98,6 +98,7 @@ #define le_socket_name "Socket" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_select, 0, 0, 4) ZEND_ARG_INFO(1, read_fds) ZEND_ARG_INFO(1, write_fds) @@ -106,78 +107,93 @@ ZEND_ARG_INFO(0, tv_usec) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_create_listen, 0, 0, 1) ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(0, backlog) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_accept, 0, 0, 1) ZEND_ARG_INFO(0, socket) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_nonblock, 0, 0, 1) ZEND_ARG_INFO(0, socket) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_block, 0, 0, 1) ZEND_ARG_INFO(0, socket) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_listen, 0, 0, 1) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, backlog) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_close, 0, 0, 1) ZEND_ARG_INFO(0, socket) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_write, 0, 0, 2) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, buf) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_read, 0, 0, 2) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, length) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_getsockname, 0, 0, 2) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(1, addr) ZEND_ARG_INFO(1, port) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_getpeername, 0, 0, 2) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(1, addr) ZEND_ARG_INFO(1, port) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_create, 0, 0, 3) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, protocol) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_connect, 0, 0, 2) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, addr) ZEND_ARG_INFO(0, port) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_strerror, 0, 0, 1) ZEND_ARG_INFO(0, errno) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_bind, 0, 0, 2) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, addr) ZEND_ARG_INFO(0, port) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_recv, 0, 0, 4) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(1, buf) @@ -185,6 +201,7 @@ ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_send, 0, 0, 4) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, buf) @@ -192,6 +209,7 @@ ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_recvfrom, 0, 0, 5) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(1, buf) @@ -201,6 +219,7 @@ ZEND_ARG_INFO(1, port) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_sendto, 0, 0, 5) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, buf) @@ -210,12 +229,14 @@ ZEND_ARG_INFO(0, port) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_get_option, 0, 0, 3) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, level) ZEND_ARG_INFO(0, optname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_option, 0, 0, 4) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, level) @@ -224,6 +245,7 @@ ZEND_END_ARG_INFO() #ifdef HAVE_SOCKETPAIR +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_create_pair, 0, 0, 4) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, type) @@ -233,16 +255,19 @@ #endif #ifdef HAVE_SHUTDOWN +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_shutdown, 0, 0, 1) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, how) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_last_error, 0, 0, 0) ZEND_ARG_INFO(0, socket) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_clear_error, 0, 0, 0) ZEND_ARG_INFO(0, socket) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.27&r2=1.52.2.28.2.17.2.28&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.27 php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.28 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.27 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/php_spl.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.17.2.27 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.17.2.28 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -745,57 +745,70 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iterator_to_array, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_ARG_INFO(0, use_keys) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_iterator, 0) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iterator_apply, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_ARG_INFO(0, function) ZEND_ARG_ARRAY_INFO(0, args, 1) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_class_parents, 0, 0, 1) ZEND_ARG_INFO(0, instance) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_class_implements, 0, 0, 1) ZEND_ARG_INFO(0, what) ZEND_ARG_INFO(0, autoload) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_spl_classes, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_spl_autoload_functions, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload, 0, 0, 1) ZEND_ARG_INFO(0, class_name) ZEND_ARG_INFO(0, file_extensions) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_extensions, 0, 0, 0) ZEND_ARG_INFO(0, file_extensions) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_call, 0, 0, 1) ZEND_ARG_INFO(0, class_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_register, 0, 0, 0) ZEND_ARG_INFO(0, autoload_function) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_unregister, 0, 0, 1) ZEND_ARG_INFO(0, autoload_function) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_object_hash, 0, 0, 1) ZEND_ARG_INFO(0, obj) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.30&r2=1.71.2.17.2.13.2.31&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.30 php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.31 --- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.30 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/spl_array.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.71.2.17.2.13.2.30 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: spl_array.c,v 1.71.2.17.2.13.2.31 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1708,43 +1708,53 @@ /* }}} */ /* {{{ arginfo and function tbale */ +static ZEND_BEGIN_ARG_INFO(arginfo_array___construct, 0) ZEND_ARG_INFO(0, array) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetGet, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetSet, 0, 0, 2) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_append, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_seek, 0) ZEND_ARG_INFO(0, position) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_exchangeArray, 0) ZEND_ARG_INFO(0, array) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_setFlags, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_setIteratorClass, 0) ZEND_ARG_INFO(0, iteratorClass) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_uXsort, 0) ZEND_ARG_INFO(0, cmp_function) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_array_unserialize, 0) ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.33&r2=1.45.2.27.2.23.2.34&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.33 php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.34 --- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.33 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/spl_directory.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.33 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.34 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1583,20 +1583,24 @@ /* {{{ declare method parameters */ /* supply a name and default to call by parameter */ +static ZEND_BEGIN_ARG_INFO(arginfo_info___construct, 0) ZEND_ARG_INFO(0, file_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_info_openFile, 0, 0, 0) ZEND_ARG_INFO(0, open_mode) ZEND_ARG_INFO(0, use_include_path) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_info_optinalFileClass, 0, 0, 0) ZEND_ARG_INFO(0, class_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_optinalSuffix, 0, 0, 0) ZEND_ARG_INFO(0, suffix) ZEND_END_ARG_INFO() @@ -1637,10 +1641,12 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO(arginfo_dir___construct, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dir_it_seek, 0) ZEND_ARG_INFO(0, position) ZEND_END_ARG_INFO(); @@ -1662,15 +1668,18 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir___construct, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir_hasChildren, 0, 0, 0) ZEND_ARG_INFO(0, allow_links) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir_setFlags, 0, 0, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() @@ -2467,6 +2476,7 @@ } /* }}} */ /* {{{ Function/Class/Method definitions */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object___construct, 0, 0, 1) ZEND_ARG_INFO(0, file_name) ZEND_ARG_INFO(0, open_mode) @@ -2474,46 +2484,56 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_file_object_setFlags, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_file_object_setMaxLineLen, 0) ZEND_ARG_INFO(0, max_len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetcsv, 0, 0, 0) ZEND_ARG_INFO(0, delimiter) ZEND_ARG_INFO(0, enclosure) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_flock, 0, 0, 1) ZEND_ARG_INFO(0, operation) ZEND_ARG_INFO(1, wouldblock) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fseek, 0, 0, 1) ZEND_ARG_INFO(0, pos) ZEND_ARG_INFO(0, whence) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetss, 0, 0, 0) ZEND_ARG_INFO(0, allowable_tags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_ftruncate, 0, 0, 1) ZEND_ARG_INFO(0, size) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_seek, 0, 0, 1) ZEND_ARG_INFO(0, line_pos) ZEND_END_ARG_INFO() @@ -2554,6 +2574,7 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_temp_file_object___construct, 0, 0, 0) ZEND_ARG_INFO(0, max_memory) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_dllist.c?r1=1.1.2.15&r2=1.1.2.16&diff_format=u Index: php-src/ext/spl/spl_dllist.c diff -u php-src/ext/spl/spl_dllist.c:1.1.2.15 php-src/ext/spl/spl_dllist.c:1.1.2.16 --- php-src/ext/spl/spl_dllist.c:1.1.2.15 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/spl_dllist.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_dllist.c,v 1.1.2.15 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: spl_dllist.c,v 1.1.2.16 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1122,18 +1122,22 @@ /* }}} */ /* Function/Class/Method definitions */ +static ZEND_BEGIN_ARG_INFO(arginfo_dllist_setiteratormode, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dllist_push, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dllist_offsetGet, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dllist_offsetSet, 0, 0, 2) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, newval) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_fixedarray.c?r1=1.1.2.7&r2=1.1.2.8&diff_format=u Index: php-src/ext/spl/spl_fixedarray.c diff -u php-src/ext/spl/spl_fixedarray.c:1.1.2.7 php-src/ext/spl/spl_fixedarray.c:1.1.2.8 --- php-src/ext/spl/spl_fixedarray.c:1.1.2.7 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/spl_fixedarray.c Sun Nov 2 21:19:36 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_fixedarray.c,v 1.1.2.7 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: spl_fixedarray.c,v 1.1.2.8 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1002,19 +1002,23 @@ } /* }}} */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fixedarray_offsetGet, 0, 0, 1) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fixedarray_offsetSet, 0, 0, 2) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fixedarray_setSize, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fixedarray_fromArray, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, save_indexes) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.1.2.9&r2=1.1.2.10&diff_format=u Index: php-src/ext/spl/spl_heap.c diff -u php-src/ext/spl/spl_heap.c:1.1.2.9 php-src/ext/spl/spl_heap.c:1.1.2.10 --- php-src/ext/spl/spl_heap.c:1.1.2.9 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/spl_heap.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_heap.c,v 1.1.2.9 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: spl_heap.c,v 1.1.2.10 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1110,20 +1110,24 @@ } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_heap_insert, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_heap_compare, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pqueue_insert, 0) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, priority) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pqueue_setflags, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.17&r2=1.73.2.30.2.28.2.18&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.17 php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.18 --- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.17 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/spl_iterators.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.17 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.18 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -839,16 +839,19 @@ } /* }}} */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it_getSubIterator, 0, 0, 0) ZEND_ARG_INFO(0, level) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it_setMaxDepth, 0, 0, 0) ZEND_ARG_INFO(0, max_depth) ZEND_END_ARG_INFO(); @@ -1095,6 +1098,7 @@ RETVAL_STRINGL(str, str_len, 0); } /* }}} */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_tree_it___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_ARG_INFO(0, flags) @@ -1102,6 +1106,7 @@ ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_tree_it_setPrefixPart, 0, 0, 2) ZEND_ARG_INFO(0, part) ZEND_ARG_INFO(0, value) @@ -1946,6 +1951,7 @@ } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_filter_it___construct, 0) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); @@ -1962,6 +1968,7 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO(arginfo_parent_it___construct, 0) ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0) ZEND_END_ARG_INFO(); @@ -1980,6 +1987,7 @@ }; #if HAVE_PCRE || HAVE_BUNDLED_PCRE +static 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) @@ -1988,14 +1996,17 @@ ZEND_ARG_INFO(0, preg_flags) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it_set_mode, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it_set_flags, 0, 0, 1) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it_set_preg_flags, 0, 0, 1) ZEND_ARG_INFO(0, preg_flags) ZEND_END_ARG_INFO(); @@ -2012,6 +2023,7 @@ {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) @@ -2147,6 +2159,7 @@ RETURN_LONG(intern->current.pos); } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_seekable_it_seek, 0) ZEND_ARG_INFO(0, position) ZEND_END_ARG_INFO(); @@ -2156,12 +2169,14 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO_EX(arginfo_limit_it___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, count) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_limit_it_seek, 0) ZEND_ARG_INFO(0, position) ZEND_END_ARG_INFO(); @@ -2540,19 +2555,23 @@ } /* }}} */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_it___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_caching_it_setFlags, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_caching_it_offsetGet, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_caching_it_offsetSet, 0) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, newval) @@ -2612,6 +2631,7 @@ } } /* }}} */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_VALUE, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, flags) @@ -2631,6 +2651,7 @@ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_IteratorIterator, zend_ce_traversable, DIT_IteratorIterator); } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_iterator_it___construct, 0) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_END_ARG_INFO(); @@ -2719,6 +2740,7 @@ intern->inner.iterator->funcs->move_forward(intern->inner.iterator TSRMLS_CC); } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_norewind_it___construct, 0) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); @@ -2951,6 +2973,7 @@ RETURN_ZVAL(intern->u.append.zarrayit, 1, 0); } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_append_it_append, 0) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_observer.c?r1=1.2.2.6.2.3.2.10&r2=1.2.2.6.2.3.2.11&diff_format=u Index: php-src/ext/spl/spl_observer.c diff -u php-src/ext/spl/spl_observer.c:1.2.2.6.2.3.2.10 php-src/ext/spl/spl_observer.c:1.2.2.6.2.3.2.11 --- php-src/ext/spl/spl_observer.c:1.2.2.6.2.3.2.10 Fri Oct 24 14:35:38 2008 +++ php-src/ext/spl/spl_observer.c Sun Nov 2 21:19:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_observer.c,v 1.2.2.6.2.3.2.10 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: spl_observer.c,v 1.2.2.6.2.3.2.11 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -43,6 +43,7 @@ SPL_METHOD(SplSubject, detach); SPL_METHOD(SplSubject, notify); +static ZEND_BEGIN_ARG_INFO(arginfo_SplObserver_update, 0) ZEND_ARG_OBJ_INFO(0, SplSubject, SplSubject, 0) ZEND_END_ARG_INFO(); @@ -52,11 +53,13 @@ {NULL, NULL, NULL} }; +static ZEND_BEGIN_ARG_INFO(arginfo_SplSubject_attach, 0) ZEND_ARG_OBJ_INFO(0, SplObserver, SplObserver, 0) ZEND_END_ARG_INFO(); -/*ZEND_BEGIN_ARG_INFO_EX(arginfo_SplSubject_notify, 0, 0, 1) +/*static +ZEND_BEGIN_ARG_INFO_EX(arginfo_SplSubject_notify, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, ignore, SplObserver, 1) ZEND_END_ARG_INFO();*/ @@ -563,27 +566,33 @@ } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_Object, 0) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_attach, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, inf) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_Serialized, 0) ZEND_ARG_INFO(0, serialized) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(arginfo_setInfo, 0) ZEND_ARG_INFO(0, info) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetGet, 0, 0, 1) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetSet, 0, 0, 2) ZEND_ARG_INFO(0, object) ZEND_ARG_INFO(0, info) @@ -869,15 +878,18 @@ } /* }}} */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_MultipleIterator_attachIterator, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, infos) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_MultipleIterator_detachIterator, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_MultipleIterator_containsIterator, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.13&r2=1.166.2.13.2.9.2.14&diff_format=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.13 php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.14 --- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.13 Fri Oct 24 14:35:38 2008 +++ php-src/ext/sqlite/sqlite.c Sun Nov 2 21:19:36 2008 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.166.2.13.2.9.2.13 2008/10/24 14:35:38 felipe Exp $ + $Id: sqlite.c,v 1.166.2.13.2.9.2.14 2008/11/02 21:19:36 felipe Exp $ */ #ifdef HAVE_CONFIG_H @@ -165,37 +165,44 @@ enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM }; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_popen, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_open, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_factory, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_busy_timeout, 0, 0, 2) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, ms) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_busy_timeout, 0, 0, 1) ZEND_ARG_INFO(0, ms) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_close, 0, 0, 1) ZEND_ARG_INFO(0, db) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_unbuffered_query, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, db) @@ -203,23 +210,27 @@ ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_unbuffered_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_column_types, 0, 0, 2) ZEND_ARG_INFO(0, table_name) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_column_types, 0, 0, 1) ZEND_ARG_INFO(0, table_name) ZEND_ARG_INFO(0, result_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_query, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, db) @@ -227,45 +238,53 @@ ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_exec, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_exec, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(1, error_message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_all, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_all, 0, 0, 0) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_array, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_array, 0, 0, 0) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_object, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, class_name) @@ -273,12 +292,14 @@ ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_object, 0, 0, 0) ZEND_ARG_INFO(0, class_name) ZEND_ARG_INFO(0, ctor_params) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_array_query, 0, 0, 2) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, query) @@ -286,12 +307,14 @@ ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_array_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_single_query, 0, 0, 2) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, query) @@ -299,152 +322,190 @@ ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_single_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, first_row_only) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_single, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_single, 0, 0, 0) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_current, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_current, 0, 0, 0) ZEND_ARG_INFO(0, result_type) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_column, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, index_or_name) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_column, 0, 0, 1) ZEND_ARG_INFO(0, index_or_name) ZEND_ARG_INFO(0, decode_binary) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_libversion, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_libencoding, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_changes, 0, 0, 1) ZEND_ARG_INFO(0, db) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_changes, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_last_insert_rowid, 0, 0, 1) ZEND_ARG_INFO(0, db) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_last_insert_rowid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_num_rows, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_num_rows, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_valid, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_valid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_has_prev, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_has_prev, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_num_fields, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_num_fields, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_field_name, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, field_index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_field_name, 0, 0, 1) ZEND_ARG_INFO(0, field_index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_seek, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_seek, 0, 0, 1) ZEND_ARG_INFO(0, row) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_rewind, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_rewind, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_next, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_next, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_key, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_key, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_prev, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_prev, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_escape_string, 0, 0, 1) ZEND_ARG_INFO(0, item) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_last_error, 0, 0, 1) ZEND_ARG_INFO(0, db) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_last_error, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_error_string, 0, 0, 1) ZEND_ARG_INFO(0, error_code) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_aggregate, 0, 0, 4) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, funcname) @@ -453,6 +514,7 @@ ZEND_ARG_INFO(0, num_args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_create_aggregate, 0, 0, 3) ZEND_ARG_INFO(0, funcname) ZEND_ARG_INFO(0, step_func) @@ -460,6 +522,7 @@ ZEND_ARG_INFO(0, num_args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_function, 0, 0, 3) ZEND_ARG_INFO(0, db) ZEND_ARG_INFO(0, funcname) @@ -467,16 +530,19 @@ ZEND_ARG_INFO(0, num_args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_create_function, 0, 0, 2) ZEND_ARG_INFO(0, funcname) ZEND_ARG_INFO(0, callback) ZEND_ARG_INFO(0, num_args) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_udf_encode_binary, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_udf_decode_binary, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() @@ -1454,7 +1520,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.13 2008/10/24 14:35:38 felipe Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.14 2008/11/02 21:19:36 felipe Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.13&r2=1.1.2.14&diff_format=u Index: php-src/ext/sqlite3/sqlite3.c diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.13 php-src/ext/sqlite3/sqlite3.c:1.1.2.14 --- php-src/ext/sqlite3/sqlite3.c:1.1.2.13 Fri Oct 24 14:35:38 2008 +++ php-src/ext/sqlite3/sqlite3.c Sun Nov 2 21:19:37 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sqlite3.c,v 1.1.2.13 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: sqlite3.c,v 1.1.2.14 2008/11/02 21:19:37 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1328,61 +1328,76 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_open, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, flags) ZEND_ARG_INFO(0, encryption_key) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_close, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_exec, 0) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_version, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lastinsertrowid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lasterrorcode, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lasterrormsg, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_loadextension, 0) ZEND_ARG_INFO(0, shared_library) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_changes, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_escapestring, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_prepare, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_querysingle, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, entire_row) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_createfunction, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, callback) ZEND_ARG_INFO(0, argument_count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_createaggregate, 0, 0, 3) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, step_callback) @@ -1390,51 +1405,64 @@ ZEND_ARG_INFO(0, argument_count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_paramcount, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_close, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_reset, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_clear, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_execute, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3stmt_bindparam, 0, 0, 2) ZEND_ARG_INFO(0, param_number) ZEND_ARG_INFO(1, param) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3stmt_bindvalue, 0, 0, 2) ZEND_ARG_INFO(0, param_number) ZEND_ARG_INFO(0, param) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_numcolumns, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_columnname, 0, 0, 1) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_columntype, 0, 0, 1) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_fetcharray, 0, 0, 1) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_reset, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_finalize, 0) ZEND_END_ARG_INFO() /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.67&r2=1.725.2.31.2.64.2.68&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.67 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.68 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.67 Sun Nov 2 18:24:34 2008 +++ php-src/ext/standard/basic_functions.c Sun Nov 2 21:19:37 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.67 2008/11/02 18:24:34 felipe Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.68 2008/11/02 21:19:37 felipe Exp $ */ #include "php.h" #include "php_streams.h" @@ -138,249 +138,303 @@ /* {{{ arginfo */ /* {{{ main/main.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_set_time_limit, 0) ZEND_ARG_INFO(0, seconds) ZEND_END_ARG_INFO() /* }}} */ /* {{{ main/output.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_start, 0, 0, 0) ZEND_ARG_INFO(0, user_function) ZEND_ARG_INFO(0, chunk_size) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_flush, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_clean, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_end_flush, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_end_clean, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_get_flush, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_get_clean, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_get_contents, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_get_level, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_get_length, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ob_list_handlers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_get_status, 0, 0, 0) ZEND_ARG_INFO(0, full_status) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_implicit_flush, 0, 0, 0) ZEND_ARG_INFO(0, flag) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_output_reset_rewrite_vars, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_output_add_rewrite_var, 0) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() /* }}} */ /* {{{ main/streams/userspace.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_wrapper_register, 0, 0, 2) ZEND_ARG_INFO(0, protocol) ZEND_ARG_INFO(0, classname) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_wrapper_unregister, 0) ZEND_ARG_INFO(0, protocol) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_wrapper_restore, 0) ZEND_ARG_INFO(0, protocol) ZEND_END_ARG_INFO() /* }}} */ /* {{{ array.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_krsort, 0, 0, 1) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ksort, 0, 0, 1) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_count, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_natsort, 0) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_natcasesort, 0) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_asort, 0, 0, 1) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_arsort, 0, 0, 1) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sort, 0, 0, 1) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_rsort, 0, 0, 1) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_usort, 0) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, cmp_function) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_uasort, 0) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, cmp_function) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_uksort, 0) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, cmp_function) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_end, 0) ZEND_ARG_INFO(1, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_prev, 0) ZEND_ARG_INFO(1, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_next, 0) ZEND_ARG_INFO(1, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_reset, 0) ZEND_ARG_INFO(1, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_current, ZEND_SEND_PREFER_REF) ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_key, ZEND_SEND_PREFER_REF) ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_min, 0, 0, 1) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_max, 0, 0, 1) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_walk, 0, 0, 2) ZEND_ARG_INFO(1, input) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, funcname) ZEND_ARG_INFO(0, userdata) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_walk_recursive, 0, 0, 2) ZEND_ARG_INFO(1, input) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, funcname) ZEND_ARG_INFO(0, userdata) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_in_array, 0, 0, 2) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, haystack) /* ARRAY_INFO(0, haystack, 0) */ ZEND_ARG_INFO(0, strict) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_search, 0, 0, 2) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, haystack) /* ARRAY_INFO(0, haystack, 0) */ ZEND_ARG_INFO(0, strict) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_extract, 0, 0, 1) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, extract_type) ZEND_ARG_INFO(0, prefix) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_compact, 0, 0, 1) ZEND_ARG_INFO(0, var_names) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_fill, 0) ZEND_ARG_INFO(0, start_key) ZEND_ARG_INFO(0, num) ZEND_ARG_INFO(0, val) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_fill_keys, 0) ZEND_ARG_INFO(0, keys) /* ARRAY_INFO(0, keys, 0) */ ZEND_ARG_INFO(0, val) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_range, 0, 0, 2) ZEND_ARG_INFO(0, low) ZEND_ARG_INFO(0, high) ZEND_ARG_INFO(0, step) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_shuffle, 0) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_push, 0, 0, 2) ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */ ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_pop, 0) ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_shift, 0) ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_unshift, 0, 0, 2) ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */ ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_splice, 0, 0, 2) ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, offset) @@ -388,6 +442,7 @@ ZEND_ARG_INFO(0, replacement) /* ARRAY_INFO(0, arg, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_slice, 0, 0, 2) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(1, arg, 0) */ ZEND_ARG_INFO(0, offset) @@ -395,110 +450,130 @@ ZEND_ARG_INFO(0, preserve_keys) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge_recursive, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace_recursive, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_keys, 0, 0, 1) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, search_value) ZEND_ARG_INFO(0, strict) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_values, 0) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_count_values, 0) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_reverse, 0, 0, 1) ZEND_ARG_INFO(0, input) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, preserve_keys) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_pad, 0) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, pad_size) ZEND_ARG_INFO(0, pad_value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_flip, 0) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_change_key_case, 0, 0, 1) ZEND_ARG_INFO(0, input) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, case) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_unique, 0) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_intersect_key, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_intersect_ukey, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, callback_key_compare_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_intersect, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, callback_data_compare_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_intersect_assoc, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect_assoc, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, callback_data_compare_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_intersect_uassoc, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, callback_key_compare_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect_uassoc, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ @@ -506,48 +581,56 @@ ZEND_ARG_INFO(0, callback_key_compare_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_diff_key, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_diff_ukey, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, callback_key_comp_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_diff, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_udiff, 0) ZEND_ARG_INFO(0, arr1) ZEND_ARG_INFO(0, arr2) ZEND_ARG_INFO(0, callback_data_comp_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_diff_assoc, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_diff_uassoc, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, callback_data_comp_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_udiff_assoc, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ ZEND_ARG_INFO(0, callback_key_comp_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_udiff_uassoc, 0) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ @@ -555,6 +638,7 @@ ZEND_ARG_INFO(0, callback_key_comp_func) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_multisort, ZEND_SEND_PREFER_REF, 0, 1) ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arr1) /* ARRAY_INFO(0, arg1, 0) */ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_ASC_or_SORT_DESC) @@ -564,30 +648,36 @@ ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_rand, 0, 0, 1) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, num_req) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_sum, 0) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_product, 0) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_reduce, 0, 0, 2) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, callback) ZEND_ARG_INFO(0, initial) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_filter, 0, 0, 1) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, callback) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_map, 0, 0, 3) ZEND_ARG_INFO(0, callback) ZEND_ARG_INFO(0, arg1) /* ARRAY_INFO(0, arg1, 0) */ @@ -595,101 +685,123 @@ ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_key_exists, 0) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, search) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_array_chunk, 0, 0, 2) ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_INFO(0, size) ZEND_ARG_INFO(0, preserve_keys) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_array_combine, 0) ZEND_ARG_INFO(0, keys) /* ARRAY_INFO(0, keys, 0) */ ZEND_ARG_INFO(0, values) /* ARRAY_INFO(0, values, 0) */ ZEND_END_ARG_INFO() /* }}} */ /* {{{ basic_functions.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_get_magic_quotes_gpc, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_magic_quotes_runtime, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_set_magic_quotes_runtime, 0, 0, 1) ZEND_ARG_INFO(0, new_setting) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_constant, 0) ZEND_ARG_INFO(0, const_name) ZEND_END_ARG_INFO() #ifdef HAVE_INET_NTOP +static ZEND_BEGIN_ARG_INFO(arginfo_inet_ntop, 0) ZEND_ARG_INFO(0, in_addr) ZEND_END_ARG_INFO() #endif #ifdef HAVE_INET_PTON +static ZEND_BEGIN_ARG_INFO(arginfo_inet_pton, 0) ZEND_ARG_INFO(0, ip_address) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_ip2long, 0) ZEND_ARG_INFO(0, ip_address) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_long2ip, 0) ZEND_ARG_INFO(0, proper_address) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_getenv, 0) ZEND_ARG_INFO(0, varname) ZEND_END_ARG_INFO() #ifdef HAVE_PUTENV +static ZEND_BEGIN_ARG_INFO(arginfo_putenv, 0) ZEND_ARG_INFO(0, setting) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_getopt, 0, 0, 1) ZEND_ARG_INFO(0, options) ZEND_ARG_INFO(0, opts) /* ARRAY_INFO(0, opts, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_flush, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sleep, 0) ZEND_ARG_INFO(0, seconds) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_usleep, 0) ZEND_ARG_INFO(0, micro_seconds) ZEND_END_ARG_INFO() #if HAVE_NANOSLEEP +static ZEND_BEGIN_ARG_INFO(arginfo_time_nanosleep, 0) ZEND_ARG_INFO(0, seconds) ZEND_ARG_INFO(0, nanoseconds) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_time_sleep_until, 0) ZEND_ARG_INFO(0, timestamp) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_get_current_user, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_cfg_var, 0) ZEND_ARG_INFO(0, option_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_error_log, 0, 0, 1) ZEND_ARG_INFO(0, message) ZEND_ARG_INFO(0, message_type) @@ -697,20 +809,24 @@ ZEND_ARG_INFO(0, extra_headers) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_error_get_last, 0, 0, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_func, 0, 0, 1) ZEND_ARG_INFO(0, function_name) ZEND_ARG_INFO(0, parmeter) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_func_array, 0, 0, 2) ZEND_ARG_INFO(0, function_name) ZEND_ARG_INFO(0, parameters) /* ARRAY_INFO(0, parameters, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_method, 0, 0, 2) ZEND_ARG_INFO(0, method_name) ZEND_ARG_INFO(1, object) @@ -718,84 +834,103 @@ ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_call_user_method_array, 0) ZEND_ARG_INFO(0, method_name) ZEND_ARG_INFO(1, object) ZEND_ARG_INFO(0, params) /* ARRAY_INFO(0, params, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_forward_static_call, 0, 0, 1) ZEND_ARG_INFO(0, function_name) ZEND_ARG_INFO(0, parameter) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_forward_static_call_array, 0, 0, 2) ZEND_ARG_INFO(0, function_name) ZEND_ARG_INFO(0, parameters) /* ARRAY_INFO(0, parameters, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_register_shutdown_function, 0) ZEND_ARG_INFO(0, function_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_highlight_file, 0, 0, 1) ZEND_ARG_INFO(0, file_name) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_strip_whitespace, 0) ZEND_ARG_INFO(0, file_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_highlight_string, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ini_get, 0) ZEND_ARG_INFO(0, varname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ini_get_all, 0, 0, 0) ZEND_ARG_INFO(0, extension) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ini_set, 0) ZEND_ARG_INFO(0, varname) ZEND_ARG_INFO(0, newvalue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ini_restore, 0) ZEND_ARG_INFO(0, varname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_set_include_path, 0) ZEND_ARG_INFO(0, new_include_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_get_include_path, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_restore_include_path, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_print_r, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_connection_aborted, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_connection_status, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ignore_user_abort, 0, 0, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() #if HAVE_GETSERVBYNAME +static ZEND_BEGIN_ARG_INFO(arginfo_getservbyname, 0) ZEND_ARG_INFO(0, service) ZEND_ARG_INFO(0, protocol) @@ -803,6 +938,7 @@ #endif #if HAVE_GETSERVBYPORT +static ZEND_BEGIN_ARG_INFO(arginfo_getservbyport, 0) ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(0, protocol) @@ -810,36 +946,43 @@ #endif #if HAVE_GETPROTOBYNAME +static ZEND_BEGIN_ARG_INFO(arginfo_getprotobyname, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() #endif #if HAVE_GETPROTOBYNUMBER +static ZEND_BEGIN_ARG_INFO(arginfo_getprotobynumber, 0) ZEND_ARG_INFO(0, proto) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_register_tick_function, 0, 0, 1) ZEND_ARG_INFO(0, function_name) ZEND_ARG_INFO(0, arg) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_unregister_tick_function, 0) ZEND_ARG_INFO(0, function_name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_uploaded_file, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_move_uploaded_file, 0) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, new_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_ini_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, process_sections) @@ -847,35 +990,42 @@ ZEND_END_ARG_INFO() #if ZEND_DEBUG +static ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1) ZEND_ARG_INFO(0, types) ZEND_ARG_INFO(0, prefix) ZEND_END_ARG_INFO() #ifdef HAVE_GETLOADAVG +static ZEND_BEGIN_ARG_INFO(arginfo_sys_getloadavg, 0) ZEND_END_ARG_INFO() #endif /* }}} */ /* {{{ assert.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_assert, 0) ZEND_ARG_INFO(0, assertion) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_assert_options, 0, 0, 1) ZEND_ARG_INFO(0, what) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() /* }}} */ /* {{{ base64.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_base64_encode, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_base64_decode, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, strict) @@ -883,12 +1033,14 @@ /* }}} */ /* {{{ browscap.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_browser, 0, 0, 0) ZEND_ARG_INFO(0, browser_name) ZEND_ARG_INFO(0, return_array) ZEND_END_ARG_INFO() /* }}} */ /* {{{ crc32.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_crc32, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() @@ -896,6 +1048,7 @@ /* }}} */ /* {{{ crypt.c */ #if HAVE_CRYPT +static ZEND_BEGIN_ARG_INFO_EX(arginfo_crypt, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, salt) @@ -903,6 +1056,7 @@ #endif /* }}} */ /* {{{ cyr_convert.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_convert_cyr_string, 0) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, from) @@ -912,6 +1066,7 @@ /* }}} */ /* {{{ datetime.c */ #if HAVE_STRPTIME +static ZEND_BEGIN_ARG_INFO(arginfo_strptime, 0) ZEND_ARG_INFO(0, timestamp) ZEND_ARG_INFO(0, format) @@ -919,48 +1074,58 @@ #endif /* }}} */ /* {{{ dir.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_opendir, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dir, 0, 0, 1) ZEND_ARG_INFO(0, directory) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_closedir, 0, 0, 0) ZEND_ARG_INFO(0, dir_handle) ZEND_END_ARG_INFO() #if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC +static ZEND_BEGIN_ARG_INFO(arginfo_chroot, 0) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_chdir, 0) ZEND_ARG_INFO(0, directory) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_getcwd, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_rewinddir, 0, 0, 0) ZEND_ARG_INFO(0, dir_handle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readdir, 0, 0, 0) ZEND_ARG_INFO(0, dir_handle) ZEND_END_ARG_INFO() #ifdef HAVE_GLOB +static ZEND_BEGIN_ARG_INFO_EX(arginfo_glob, 0, 0, 1) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_scandir, 0, 0, 1) ZEND_ARG_INFO(0, dir) ZEND_ARG_INFO(0, sorting_order) @@ -968,30 +1133,36 @@ ZEND_END_ARG_INFO() /* }}} */ /* {{{ arginfo ext/standard/dl.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_dl, 0) ZEND_ARG_INFO(0, extension_filename) ZEND_END_ARG_INFO() /* }}} */ /* {{{ dns.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_gethostbyaddr, 0) ZEND_ARG_INFO(0, ip_address) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gethostbyname, 0) ZEND_ARG_INFO(0, hostname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_gethostbynamel, 0) ZEND_ARG_INFO(0, hostname) ZEND_END_ARG_INFO() #if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() # if HAVE_DNS_FUNCS +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_record, 1, 0, 1) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, type) @@ -1001,6 +1172,7 @@ # endif # if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(1, mxhosts) /* ARRAY_INFO(1, mxhosts, 1) */ @@ -1010,52 +1182,62 @@ #endif /* HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) */ /* }}} */ /* {{{ exec.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_exec, 0, 0, 1) ZEND_ARG_INFO(0, command) ZEND_ARG_INFO(1, output) /* ARRAY_INFO(1, output, 1) */ ZEND_ARG_INFO(1, return_value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_system, 0, 0, 1) ZEND_ARG_INFO(0, command) ZEND_ARG_INFO(1, return_value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_passthru, 0, 0, 1) ZEND_ARG_INFO(0, command) ZEND_ARG_INFO(1, return_value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_escapeshellcmd, 0) ZEND_ARG_INFO(0, command) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_escapeshellarg, 0) ZEND_ARG_INFO(0, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_shell_exec, 0) ZEND_ARG_INFO(0, cmd) ZEND_END_ARG_INFO() #ifdef HAVE_NICE +static ZEND_BEGIN_ARG_INFO(arginfo_proc_nice, 0) ZEND_ARG_INFO(0, priority) ZEND_END_ARG_INFO() #endif /* }}} */ /* {{{ file.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_flock, 0, 0, 2) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, operation) ZEND_ARG_INFO(1, wouldblock) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_meta_tags, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, use_include_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_get_contents, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, flags) @@ -1064,6 +1246,7 @@ ZEND_ARG_INFO(0, maxlen) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file_put_contents, 0, 0, 2) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, data) @@ -1071,20 +1254,24 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, flags) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tempnam, 0) ZEND_ARG_INFO(0, dir) ZEND_ARG_INFO(0, prefix) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tmpfile, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fopen, 0, 0, 2) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, mode) @@ -1092,68 +1279,82 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fclose, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_popen, 0) ZEND_ARG_INFO(0, command) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pclose, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_feof, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fgets, 0, 0, 1) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fgetc, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetss, 0, 0, 1) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, length) ZEND_ARG_INFO(0, allowable_tags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fscanf, 1, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fwrite, 0, 0, 2) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fflush, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_rewind, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftell, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fseek, 0, 0, 2) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, whence) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mkdir, 0, 0, 1) ZEND_ARG_INFO(0, pathname) ZEND_ARG_INFO(0, mode) @@ -1161,54 +1362,65 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_rmdir, 0, 0, 1) ZEND_ARG_INFO(0, dirname) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readfile, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, flags) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_umask, 0, 0, 0) ZEND_ARG_INFO(0, mask) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fpassthru, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_rename, 0, 0, 2) ZEND_ARG_INFO(0, old_name) ZEND_ARG_INFO(0, new_name) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_unlink, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ftruncate, 0) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, size) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fstat, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_copy, 0) ZEND_ARG_INFO(0, source_file) ZEND_ARG_INFO(0, destination_file) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fread, 0) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fputcsv, 0, 0, 2) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, fields) /* ARRAY_INFO(0, fields, 1) */ @@ -1216,6 +1428,7 @@ ZEND_ARG_INFO(0, enclosure) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetcsv, 0, 0, 1) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, length) @@ -1224,12 +1437,14 @@ ZEND_END_ARG_INFO() #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) +static ZEND_BEGIN_ARG_INFO(arginfo_realpath, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() #endif #ifdef HAVE_FNMATCH +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fnmatch, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, filename) @@ -1237,24 +1452,29 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_sys_get_temp_dir, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ filestat.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_disk_total_space, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_disk_free_space, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() #ifndef NETWARE +static ZEND_BEGIN_ARG_INFO(arginfo_chgrp, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, group) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_chown, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, user) @@ -1262,23 +1482,27 @@ #endif #if HAVE_LCHOWN +static ZEND_BEGIN_ARG_INFO(arginfo_lchgrp, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, group) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_lchown, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, user) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_chmod, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() #if HAVE_UTIME +static ZEND_BEGIN_ARG_INFO_EX(arginfo_touch, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, time) @@ -1286,106 +1510,130 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_clearstatcache, 0, 0, 0) ZEND_ARG_INFO(0, clear_realpath_cache) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fileperms, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fileinode, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_filesize, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fileowner, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_filegroup, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fileatime, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_filemtime, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_filectime, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_filetype, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_writable, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_readable, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_executable, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_file, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_dir, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_link, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_file_exists, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_lstat, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stat, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() /* }}} */ /* {{{ formatted_print.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sprintf, 0, 0, 2) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_vsprintf, 0) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, args) /* ARRAY_INFO(0, args, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_printf, 0, 0, 1) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_vprintf, 0) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, args) /* ARRAY_INFO(0, args, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fprintf, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, format) @@ -1393,6 +1641,7 @@ ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_vfprintf, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, format) @@ -1400,6 +1649,7 @@ ZEND_END_ARG_INFO() /* }}} */ /* {{{ fsock.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, port) @@ -1408,6 +1658,7 @@ ZEND_ARG_INFO(0, timeout) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pfsockopen, 0, 0, 2) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, port) @@ -1418,6 +1669,7 @@ /* }}} */ /* {{{ ftok.c */ #if HAVE_FTOK +static ZEND_BEGIN_ARG_INFO(arginfo_ftok, 0) ZEND_ARG_INFO(0, pathname) ZEND_ARG_INFO(0, proj) @@ -1425,12 +1677,14 @@ #endif /* }}} */ /* {{{ head.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_header, 0, 0, 1) ZEND_ARG_INFO(0, header) ZEND_ARG_INFO(0, replace) ZEND_ARG_INFO(0, http_response_code) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_setcookie, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) @@ -1440,6 +1694,7 @@ ZEND_ARG_INFO(0, secure) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) @@ -1449,15 +1704,18 @@ ZEND_ARG_INFO(0, secure) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_headers_sent, 0, 0, 0) ZEND_ARG_INFO(1, file) ZEND_ARG_INFO(1, line) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_headers_list, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ html.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlspecialchars, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, quote_style) @@ -1465,17 +1723,20 @@ ZEND_ARG_INFO(0, double_encode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlspecialchars_decode, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, quote_style) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_html_entity_decode, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, quote_style) ZEND_ARG_INFO(0, charset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlentities, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, quote_style) @@ -1483,6 +1744,7 @@ ZEND_ARG_INFO(0, double_encode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_html_translation_table, 0, 0, 0) ZEND_ARG_INFO(0, table) ZEND_ARG_INFO(0, quote_style) @@ -1490,6 +1752,7 @@ /* }}} */ /* {{{ http.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_http_build_query, 0, 0, 1) ZEND_ARG_INFO(0, formdata) ZEND_ARG_INFO(0, prefix) @@ -1497,73 +1760,91 @@ ZEND_END_ARG_INFO() /* }}} */ /* {{{ image.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_image_type_to_mime_type, 0) ZEND_ARG_INFO(0, imagetype) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_image_type_to_extension, 0, 0, 1) ZEND_ARG_INFO(0, imagetype) ZEND_ARG_INFO(0, include_dot) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_getimagesize, 0, 0, 1) ZEND_ARG_INFO(0, imagefile) ZEND_ARG_INFO(1, info) /* ARRAY_INFO(1, info, 1) */ ZEND_END_ARG_INFO() /* }}} */ /* {{{ info.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phpinfo, 0, 0, 0) ZEND_ARG_INFO(0, what) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phpversion, 0, 0, 0) ZEND_ARG_INFO(0, extension) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_phpcredits, 0, 0, 0) ZEND_ARG_INFO(0, flag) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_logo_guid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_sapi_name, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_uname, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_ini_scanned_files, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_ini_loaded_file, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ iptc.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_iptcembed, 0, 0, 2) ZEND_ARG_INFO(0, iptcdata) ZEND_ARG_INFO(0, jpeg_file_name) ZEND_ARG_INFO(0, spool) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_iptcparse, 0) ZEND_ARG_INFO(0, iptcdata) ZEND_END_ARG_INFO() /* }}} */ /* {{{ lcg.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_lcg_value, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ levenshtein.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_levenshtein, 0) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) @@ -1574,19 +1855,23 @@ /* }}} */ /* {{{ link.c */ #ifdef HAVE_SYMLINK +static ZEND_BEGIN_ARG_INFO(arginfo_readlink, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_linkinfo, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_symlink, 0) ZEND_ARG_INFO(0, target) ZEND_ARG_INFO(0, link) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_link, 0) ZEND_ARG_INFO(0, target) ZEND_ARG_INFO(0, link) @@ -1594,10 +1879,12 @@ #endif /* }}} */ /* {{{ mail.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_ezmlm_hash, 0) ZEND_ARG_INFO(0, addr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mail, 0, 0, 3) ZEND_ARG_INFO(0, to) ZEND_ARG_INFO(0, subject) @@ -1607,164 +1894,203 @@ ZEND_END_ARG_INFO() /* }}} */ /* {{{ math.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_abs, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ceil, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_floor, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_round, 0, 0, 1) ZEND_ARG_INFO(0, number) ZEND_ARG_INFO(0, precision) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sin, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_cos, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tan, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_asin, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_acos, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_atan, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_atan2, 0) ZEND_ARG_INFO(0, y) ZEND_ARG_INFO(0, x) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sinh, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_cosh, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tanh, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_asinh, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_acosh, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_atanh, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pi, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_finite, 0) ZEND_ARG_INFO(0, val) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_infinite, 0) ZEND_ARG_INFO(0, val) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_nan, 0) ZEND_ARG_INFO(0, val) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pow, 0) ZEND_ARG_INFO(0, base) ZEND_ARG_INFO(0, exponent) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_exp, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_expm1, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_log1p, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_log, 0, 0, 1) ZEND_ARG_INFO(0, number) ZEND_ARG_INFO(0, base) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_log10, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_sqrt, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_hypot, 0) ZEND_ARG_INFO(0, num1) ZEND_ARG_INFO(0, num2) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_deg2rad, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_rad2deg, 0) ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_bindec, 0) ZEND_ARG_INFO(0, binary_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_hexdec, 0) ZEND_ARG_INFO(0, hexadecimal_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_octdec, 0) ZEND_ARG_INFO(0, octal_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_decbin, 0) ZEND_ARG_INFO(0, decimal_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_decoct, 0) ZEND_ARG_INFO(0, decimal_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dechex, 0) ZEND_ARG_INFO(0, decimal_number) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_base_convert, 0) ZEND_ARG_INFO(0, number) ZEND_ARG_INFO(0, frombase) ZEND_ARG_INFO(0, tobase) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_number_format, 0, 0, 1) ZEND_ARG_INFO(0, number) ZEND_ARG_INFO(0, num_decimal_places) @@ -1772,23 +2098,27 @@ ZEND_ARG_INFO(0, thousands_seperator) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_fmod, 0) ZEND_ARG_INFO(0, x) ZEND_ARG_INFO(0, y) ZEND_END_ARG_INFO() /* }}} */ /* {{{ md5.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_md5, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_md5_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() /* }}} */ /* {{{ metaphone.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_metaphone, 0, 0, 1) ZEND_ARG_INFO(0, text) ZEND_ARG_INFO(0, phones) @@ -1796,64 +2126,78 @@ /* }}} */ /* {{{ microtime.c */ #ifdef HAVE_GETTIMEOFDAY +static ZEND_BEGIN_ARG_INFO_EX(arginfo_microtime, 0, 0, 0) ZEND_ARG_INFO(0, get_as_float) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gettimeofday, 0, 0, 0) ZEND_ARG_INFO(0, get_as_float) ZEND_END_ARG_INFO() #endif #ifdef HAVE_GETRUSAGE +static ZEND_BEGIN_ARG_INFO_EX(arginfo_getrusage, 0, 0, 0) ZEND_ARG_INFO(0, who) ZEND_END_ARG_INFO() #endif /* }}} */ /* {{{ pack.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pack, 0, 0, 2) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_unpack, 0) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, input) ZEND_END_ARG_INFO() /* }}} */ /* {{{ pageinfo.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_getmyuid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_getmygid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_getmypid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_getmyinode, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_getlastmod, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ proc_open.c */ #ifdef PHP_CAN_SUPPORT_PROC_OPEN +static ZEND_BEGIN_ARG_INFO_EX(arginfo_proc_terminate, 0, 0, 1) ZEND_ARG_INFO(0, process) ZEND_ARG_INFO(0, signal) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_proc_close, 0) ZEND_ARG_INFO(0, process) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_proc_get_status, 0) ZEND_ARG_INFO(0, process) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_proc_open, 0, 0, 3) ZEND_ARG_INFO(0, command) ZEND_ARG_INFO(0, descriptorspec) /* ARRAY_INFO(0, descriptorspec, 1) */ @@ -1865,58 +2209,70 @@ #endif /* }}} */ /* {{{ quot_print.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_quoted_printable_decode, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() /* }}} */ /* {{{ quot_print.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_quoted_printable_encode, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() /* }}} */ /* {{{ rand.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_srand, 0, 0, 0) ZEND_ARG_INFO(0, seed) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mt_srand, 0, 0, 0) ZEND_ARG_INFO(0, seed) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_rand, 0, 0, 0) ZEND_ARG_INFO(0, min) ZEND_ARG_INFO(0, max) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_mt_rand, 0, 0, 0) ZEND_ARG_INFO(0, min) ZEND_ARG_INFO(0, max) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_getrandmax, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_mt_getrandmax, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ sha1.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sha1, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sha1_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, raw_output) ZEND_END_ARG_INFO() /* }}} */ /* {{{ soundex.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_soundex, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() /* }}} */ /* {{{ streamsfuncs.c */ #if HAVE_SOCKETPAIR +static ZEND_BEGIN_ARG_INFO(arginfo_stream_socket_pair, 0) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, type) @@ -1924,6 +2280,7 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_client, 0, 0, 1) ZEND_ARG_INFO(0, remoteaddress) ZEND_ARG_INFO(1, errcode) @@ -1933,6 +2290,7 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_server, 0, 0, 1) ZEND_ARG_INFO(0, localaddress) ZEND_ARG_INFO(1, errcode) @@ -1941,17 +2299,20 @@ ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_accept, 0, 0, 1) ZEND_ARG_INFO(0, serverstream) ZEND_ARG_INFO(0, timeout) ZEND_ARG_INFO(1, peername) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_socket_get_name, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, want_peer) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_sendto, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, data) @@ -1959,6 +2320,7 @@ ZEND_ARG_INFO(0, target_addr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_recvfrom, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, amount) @@ -1966,12 +2328,14 @@ ZEND_ARG_INFO(1, remote_addr) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_get_contents, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, maxlen) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_copy_to_stream, 0, 0, 2) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, dest) @@ -1979,24 +2343,30 @@ ZEND_ARG_INFO(0, pos) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_get_meta_data, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_get_transports, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_get_wrappers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_is_local, 0) ZEND_ARG_INFO(0, stream) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_supports_lock, 0, 0, 1) ZEND_ARG_INFO(0, stream) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_select, 0, 0, 4) ZEND_ARG_INFO(1, read_streams) /* ARRAY_INFO(1, read_streams, 1) */ ZEND_ARG_INFO(1, write_streams) /* ARRAY_INFO(1, write_streams, 1) */ @@ -2005,10 +2375,12 @@ ZEND_ARG_INFO(0, tv_usec) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_context_get_options, 0) ZEND_ARG_INFO(0, stream_or_context) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_option, 0) ZEND_ARG_INFO(0, stream_or_context) ZEND_ARG_INFO(0, wrappername) @@ -2016,24 +2388,29 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_params, 0) ZEND_ARG_INFO(0, stream_or_context) ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_get_default, 0, 0, 0) ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_default, 0) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_create, 0, 0, 0) ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */ ZEND_ARG_INFO(0, params) /* ARRAY_INFO(0, params, 1) */ ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_filter_prepend, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, filtername) @@ -2041,6 +2418,7 @@ ZEND_ARG_INFO(0, filterparams) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_filter_append, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, filtername) @@ -2048,22 +2426,26 @@ ZEND_ARG_INFO(0, filterparams) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_filter_remove, 0) ZEND_ARG_INFO(0, stream_filter) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_get_line, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, maxlen) ZEND_ARG_INFO(0, ending) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_set_blocking, 0) ZEND_ARG_INFO(0, socket) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() #if HAVE_SYS_TIME_H || defined(PHP_WIN32) +static ZEND_BEGIN_ARG_INFO(arginfo_stream_set_timeout, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, seconds) @@ -2071,11 +2453,13 @@ ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_stream_set_write_buffer, 0) ZEND_ARG_INFO(0, fp) ZEND_ARG_INFO(0, buffer) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_enable_crypto, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, enable) @@ -2084,6 +2468,7 @@ ZEND_END_ARG_INFO() #ifdef HAVE_SHUTDOWN +static ZEND_BEGIN_ARG_INFO(arginfo_stream_socket_shutdown, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, how) @@ -2091,10 +2476,12 @@ #endif /* }}} */ /* {{{ string.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_bin2hex, 0) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strspn, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, mask) @@ -2102,6 +2489,7 @@ ZEND_ARG_INFO(0, len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strcspn, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, mask) @@ -2110,33 +2498,39 @@ ZEND_END_ARG_INFO() #if HAVE_NL_LANGINFO +static ZEND_BEGIN_ARG_INFO(arginfo_nl_langinfo, 0) ZEND_ARG_INFO(0, item) ZEND_END_ARG_INFO() #endif #ifdef HAVE_STRCOLL +static ZEND_BEGIN_ARG_INFO(arginfo_strcoll, 0) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_trim, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, character_mask) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_rtrim, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, character_mask) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ltrim, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, character_mask) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_wordwrap, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, width) @@ -2144,97 +2538,115 @@ ZEND_ARG_INFO(0, cut) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_explode, 0, 0, 2) ZEND_ARG_INFO(0, separator) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, limit) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_implode, 0) ZEND_ARG_INFO(0, glue) ZEND_ARG_INFO(0, pieces) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_strtok, 0) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, token) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_strtoupper, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_strtolower, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_basename, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, suffix) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_dirname, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_pathinfo, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stristr, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, part) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strstr, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, part) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strpos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_stripos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strrpos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strripos, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_strrchr, 0) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, needle) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_chunk_split, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, chunklen) ZEND_ARG_INFO(0, ending) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_substr, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, start) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_replace, 0, 0, 3) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, replace) @@ -2242,63 +2654,77 @@ ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_quotemeta, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ord, 0) ZEND_ARG_INFO(0, character) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_chr, 0) ZEND_ARG_INFO(0, codepoint) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ucfirst, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_lcfirst, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_ucwords, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strtr, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, from) ZEND_ARG_INFO(0, to) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_strrev, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_similar_text, 0, 0, 2) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_ARG_INFO(1, percent) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_addcslashes, 0) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, charlist) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_addslashes, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stripcslashes, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stripslashes, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_str_replace, 0, 0, 3) ZEND_ARG_INFO(0, search) ZEND_ARG_INFO(0, replace) @@ -2306,6 +2732,7 @@ ZEND_ARG_INFO(1, replace_count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_str_ireplace, 0, 0, 3) ZEND_ARG_INFO(0, search) ZEND_ARG_INFO(0, replace) @@ -2313,37 +2740,44 @@ ZEND_ARG_INFO(1, replace_count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hebrev, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, max_chars_per_line) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_hebrevc, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, max_chars_per_line) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_nl2br, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, is_xhtml) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strip_tags, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, allowable_tags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_setlocale, 0, 0, 2) ZEND_ARG_INFO(0, category) ZEND_ARG_INFO(0, locale) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_str, 0, 0, 1) ZEND_ARG_INFO(0, encoded_string) ZEND_ARG_INFO(1, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_str_getcsv, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, delimiter) @@ -2351,11 +2785,13 @@ ZEND_ARG_INFO(0, escape) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_str_repeat, 0) ZEND_ARG_INFO(0, input) ZEND_ARG_INFO(0, mult) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_count_chars, 0, 0, 1) ZEND_ARG_INFO(0, input) ZEND_ARG_INFO(0, mode) @@ -2381,6 +2817,7 @@ ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_str_pad, 0, 0, 2) ZEND_ARG_INFO(0, input) ZEND_ARG_INFO(0, pad_length) @@ -2388,20 +2825,24 @@ ZEND_ARG_INFO(0, pad_type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sscanf, 1, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_str_rot13, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_str_shuffle, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_str_word_count, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, format) @@ -2409,22 +2850,26 @@ ZEND_END_ARG_INFO() #ifdef HAVE_STRFMON +static ZEND_BEGIN_ARG_INFO(arginfo_money_format, 0) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO_EX(arginfo_str_split, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, split_length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_strpbrk, 0, 0, 1) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, char_list) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_compare, 0, 0, 3) ZEND_ARG_INFO(0, main_str) ZEND_ARG_INFO(0, str) @@ -2435,18 +2880,22 @@ /* }}} */ /* {{{ syslog.c */ #ifdef HAVE_SYSLOG_H +static ZEND_BEGIN_ARG_INFO(arginfo_define_syslog_variables, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_openlog, 0) ZEND_ARG_INFO(0, ident) ZEND_ARG_INFO(0, option) ZEND_ARG_INFO(0, facility) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_closelog, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_syslog, 0) ZEND_ARG_INFO(0, priority) ZEND_ARG_INFO(0, message) @@ -2454,68 +2903,84 @@ #endif /* }}} */ /* {{{ type.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_gettype, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_settype, 0) ZEND_ARG_INFO(1, var) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_intval, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, base) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_floatval, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_strval, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_null, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_resource, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_bool, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_long, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_float, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_string, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_array, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_object, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_numeric, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_is_scalar, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_is_callable, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, syntax_only) @@ -2524,6 +2989,7 @@ /* }}} */ /* {{{ uniqid.c */ #ifdef HAVE_GETTIMEOFDAY +static ZEND_BEGIN_ARG_INFO_EX(arginfo_uniqid, 0, 0, 0) ZEND_ARG_INFO(0, prefix) ZEND_ARG_INFO(0, more_entropy) @@ -2531,102 +2997,124 @@ #endif /* }}} */ /* {{{ url.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_url, 0, 0, 1) ZEND_ARG_INFO(0, url) ZEND_ARG_INFO(0, component) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_urlencode, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_urldecode, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_rawurlencode, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_rawurldecode, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_get_headers, 0, 0, 1) ZEND_ARG_INFO(0, url) ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() /* }}} */ /* {{{ user_filters.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_make_writeable, 0) ZEND_ARG_INFO(0, brigade) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_prepend, 0) ZEND_ARG_INFO(0, brigade) ZEND_ARG_INFO(0, bucket) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_append, 0) ZEND_ARG_INFO(0, brigade) ZEND_ARG_INFO(0, bucket) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_new, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, buffer) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_get_filters, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_stream_filter_register, 0) ZEND_ARG_INFO(0, filtername) ZEND_ARG_INFO(0, classname) ZEND_END_ARG_INFO() /* }}} */ /* {{{ uuencode.c */ +static ZEND_BEGIN_ARG_INFO(arginfo_convert_uuencode, 0) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_convert_uudecode, 0) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() /* }}} */ /* {{{ var.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_var_dump, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_zval_dump, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_var_export, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, return) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_serialize, 0) ZEND_ARG_INFO(0, var) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_unserialize, 0) ZEND_ARG_INFO(0, variable_representation) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0) ZEND_ARG_INFO(0, real_usage) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_peak_usage, 0, 0, 0) ZEND_ARG_INFO(0, real_usage) ZEND_END_ARG_INFO() /* }}} */ /* {{{ versioning.c */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_version_compare, 0, 0, 2) ZEND_ARG_INFO(0, ver1) ZEND_ARG_INFO(0, ver2) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.9.2.7&r2=1.31.2.4.2.9.2.8&diff_format=u Index: php-src/ext/standard/user_filters.c diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.7 php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.8 --- php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.7 Fri Oct 24 14:35:38 2008 +++ php-src/ext/standard/user_filters.c Sun Nov 2 21:19:37 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: user_filters.c,v 1.31.2.4.2.9.2.7 2008/10/24 14:35:38 felipe Exp $ */ +/* $Id: user_filters.c,v 1.31.2.4.2.9.2.8 2008/11/02 21:19:37 felipe Exp $ */ #include "php.h" #include "php_globals.h" @@ -54,6 +54,7 @@ PHP_FUNCTION(user_filter_nop) { } +static ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_filter, 0) ZEND_ARG_INFO(0, in) ZEND_ARG_INFO(0, out) @@ -61,9 +62,11 @@ ZEND_ARG_INFO(0, closing) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_onCreate, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_onClose, 0) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.7&r2=1.103.2.5.2.13.2.8&diff_format=u Index: php-src/ext/sybase_ct/php_sybase_ct.c diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.7 php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.8 --- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.7 Fri Oct 24 14:35:39 2008 +++ php-src/ext/sybase_ct/php_sybase_ct.c Sun Nov 2 21:19:38 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.7 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.8 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H @@ -42,6 +42,7 @@ static PHP_GSHUTDOWN_FUNCTION(sybase); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_connect, 0, 0, 0) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, user) @@ -50,6 +51,7 @@ ZEND_ARG_INFO(0, appname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_pconnect, 0, 0, 0) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, user) @@ -58,95 +60,116 @@ ZEND_ARG_INFO(0, appname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_close, 0, 0, 0) ZEND_ARG_INFO(0, link_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_select_db, 0, 0, 1) ZEND_ARG_INFO(0, database) ZEND_ARG_INFO(0, link_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, link_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_unbuffered_query, 0, 0, 1) ZEND_ARG_INFO(0, query) ZEND_ARG_INFO(0, link_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_free_result, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_get_last_message, 0, 0, 1) ZEND_ARG_INFO(0, d) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_num_rows, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_num_fields, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_row, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_object, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_array, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_assoc, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_data_seek, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_field, 0, 0, 1) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_field_seek, 0, 0, 2) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_result, 0, 0, 3) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(0, row) ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_affected_rows, 0, 0, 0) ZEND_ARG_INFO(0, link_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_min_client_severity, 0, 0, 1) ZEND_ARG_INFO(0, severity) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_min_server_severity, 0, 0, 1) ZEND_ARG_INFO(0, severity) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_deadlock_retry_count, 0, 0, 1) ZEND_ARG_INFO(0, retry_count) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_set_message_handler, 0, 0, 1) ZEND_ARG_INFO(0, error_func) ZEND_ARG_INFO(0, connection) http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.6.2.6&r2=1.20.2.3.2.6.2.7&diff_format=u Index: php-src/ext/sysvmsg/sysvmsg.c diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.6 php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.7 --- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.6 Fri Oct 24 14:35:39 2008 +++ php-src/ext/sysvmsg/sysvmsg.c Sun Nov 2 21:19:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.6 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.7 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,11 +40,13 @@ static int le_sysvmsg; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_get_queue, 0, 0, 1) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, perms) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_send, 0, 0, 3) ZEND_ARG_INFO(0, queue) ZEND_ARG_INFO(0, msgtype) @@ -54,6 +56,7 @@ ZEND_ARG_INFO(1, errorcode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_receive, 0, 0, 5) ZEND_ARG_INFO(0, queue) ZEND_ARG_INFO(0, desiredmsgtype) @@ -65,19 +68,23 @@ ZEND_ARG_INFO(1, errorcode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_remove_queue, 0, 0, 1) ZEND_ARG_INFO(0, queue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_stat_queue, 0, 0, 1) ZEND_ARG_INFO(0, queue) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_set_queue, 0, 0, 2) ZEND_ARG_INFO(0, queue) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_queue_exists, 0, 0, 1) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() @@ -145,7 +152,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "sysvmsg support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.6.2.6 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.6.2.7 $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/sysvsem/sysvsem.c?r1=1.51.2.3.2.2.2.4&r2=1.51.2.3.2.2.2.5&diff_format=u Index: php-src/ext/sysvsem/sysvsem.c diff -u php-src/ext/sysvsem/sysvsem.c:1.51.2.3.2.2.2.4 php-src/ext/sysvsem/sysvsem.c:1.51.2.3.2.2.2.5 --- php-src/ext/sysvsem/sysvsem.c:1.51.2.3.2.2.2.4 Fri Oct 24 14:35:39 2008 +++ php-src/ext/sysvsem/sysvsem.c Sun Nov 2 21:19:38 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.51.2.3.2.2.2.4 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: sysvsem.c,v 1.51.2.3.2.2.2.5 2008/11/02 21:19:38 felipe Exp $ */ /* Latest update build anc tested on Linux 2.2.14 * @@ -57,6 +57,7 @@ #endif /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sem_get, 0, 0, 1) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, max_acquire) @@ -64,14 +65,17 @@ ZEND_ARG_INFO(0, auto_release) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sem_acquire, 0, 0, 1) ZEND_ARG_INFO(0, sem_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sem_release, 0, 0, 1) ZEND_ARG_INFO(0, sem_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_sem_remove, 0, 0, 1) ZEND_ARG_INFO(0, sem_identifier) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2.2.5.2.6&r2=1.70.2.2.2.5.2.7&diff_format=u Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.6 php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.7 --- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.6 Fri Oct 24 14:35:39 2008 +++ php-src/ext/sysvshm/sysvshm.c Sun Nov 2 21:19:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.6 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.7 2008/11/02 21:19:38 felipe Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -40,31 +40,37 @@ #include "php_ini.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_attach, 0, 0, 1) ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, memsize) ZEND_ARG_INFO(0, perm) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_detach, 0, 0, 1) ZEND_ARG_INFO(0, shm_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_remove, 0, 0, 1) ZEND_ARG_INFO(0, shm_identifier) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_put_var, 0, 0, 3) ZEND_ARG_INFO(0, shm_identifier) ZEND_ARG_INFO(0, variable_key) ZEND_ARG_INFO(0, variable) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_get_var, 0, 0, 2) ZEND_ARG_INFO(0, id) ZEND_ARG_INFO(0, variable_key) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_remove_var, 0, 0, 2) ZEND_ARG_INFO(0, id) ZEND_ARG_INFO(0, variable_key) http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.24.2.8&r2=1.66.2.8.2.24.2.9&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.8 php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.9 --- php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.8 Fri Oct 24 14:35:39 2008 +++ php-src/ext/tidy/tidy.c Sun Nov 2 21:19:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.66.2.8.2.24.2.8 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: tidy.c,v 1.66.2.8.2.24.2.9 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -278,19 +278,23 @@ PHP_INI_END() /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_string, 0, 0, 1) ZEND_ARG_INFO(0, input) ZEND_ARG_INFO(0, config_options) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_error_buffer, 0, 0, 0) ZEND_ARG_INFO(0, detailed) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_output, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_file, 0, 0, 1) ZEND_ARG_INFO(0, file) ZEND_ARG_INFO(0, config_options) @@ -298,15 +302,18 @@ ZEND_ARG_INFO(0, use_include_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_clean_repair, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_string, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, config_file) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_file, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, config_file) @@ -314,63 +321,81 @@ ZEND_ARG_INFO(0, use_include_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_diagnose, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_release, 0) ZEND_END_ARG_INFO() #if HAVE_TIDYOPTGETDOC +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_opt_doc, 0, 0, 2) ZEND_ARG_INFO(0, resource) ZEND_ARG_INFO(0, optname) ZEND_END_ARG_INFO() #endif +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_config, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_status, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_html_ver, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_is_xhtml, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_is_xml, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_error_count, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_warning_count, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_access_count, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_config_count, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt, 0, 0, 1) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_root, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_html, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_head, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_body, 0, 0, 1) ZEND_ARG_INFO(0, tidy) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_tidyhandler, 0, 0, 1) ZEND_ARG_INFO(0, input) ZEND_ARG_INFO(0, mode) @@ -1098,7 +1123,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.24.2.8 2008/10/24 14:35:39 felipe Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.24.2.9 2008/11/02 21:19:38 felipe Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7.2.10&r2=1.31.2.5.2.7.2.11&diff_format=u Index: php-src/ext/tokenizer/tokenizer.c diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.10 php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.11 --- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.10 Fri Oct 24 14:35:39 2008 +++ php-src/ext/tokenizer/tokenizer.c Sun Nov 2 21:19:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.10 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.11 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,10 +36,12 @@ #define zendleng LANG_SCNG(yy_leng) /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_token_get_all, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_token_name, 0, 0, 1) ZEND_ARG_INFO(0, token) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.17.2.12&r2=1.119.2.10.2.17.2.13&diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.17.2.12 php-src/ext/wddx/wddx.c:1.119.2.10.2.17.2.13 --- php-src/ext/wddx/wddx.c:1.119.2.10.2.17.2.12 Fri Oct 24 14:35:39 2008 +++ php-src/ext/wddx/wddx.c Sun Nov 2 21:19:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.119.2.10.2.17.2.12 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: wddx.c,v 1.119.2.10.2.17.2.13 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -103,30 +103,36 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_value, 0, 0, 1) ZEND_ARG_INFO(0, var) ZEND_ARG_INFO(0, comment) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_vars, 0, 0, 1) ZEND_ARG_INFO(0, var_name) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_start, 0, 0, 0) ZEND_ARG_INFO(0, comment) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_packet_end, 0, 0, 1) ZEND_ARG_INFO(0, packet_id) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_add_vars, 0, 0, 2) ZEND_ARG_INFO(0, packet_id) ZEND_ARG_INFO(0, var_name) ZEND_ARG_INFO(0, ...) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_deserialize, 0, 0, 1) ZEND_ARG_INFO(0, packet) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.157.2.4.2.5.2.12&r2=1.157.2.4.2.5.2.13&diff_format=u Index: php-src/ext/xml/xml.c diff -u php-src/ext/xml/xml.c:1.157.2.4.2.5.2.12 php-src/ext/xml/xml.c:1.157.2.4.2.5.2.13 --- php-src/ext/xml/xml.c:1.157.2.4.2.5.2.12 Fri Oct 24 14:35:39 2008 +++ php-src/ext/xml/xml.c Sun Nov 2 21:19:38 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.157.2.4.2.5.2.12 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: xml.c,v 1.157.2.4.2.5.2.13 2008/11/02 21:19:38 felipe Exp $ */ #define IS_EXT_MODULE @@ -96,72 +96,86 @@ /* }}} */ /* {{{ extension definition structures */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create_ns, 0, 0, 0) ZEND_ARG_INFO(0, encoding) ZEND_ARG_INFO(0, sep) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_object, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(1, obj) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_element_handler, 0, 0, 3) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, shdl) ZEND_ARG_INFO(0, ehdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_character_data_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_processing_instruction_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_default_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_unparsed_entity_decl_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_notation_decl_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_external_entity_ref_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_start_namespace_decl_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_end_namespace_decl_handler, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, hdl) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parse, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, isfinal) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parse_into_struct, 0, 0, 3) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, data) @@ -169,45 +183,55 @@ ZEND_ARG_INFO(1, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_error_code, 0, 0, 1) ZEND_ARG_INFO(0, parser) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_error_string, 0, 0, 1) ZEND_ARG_INFO(0, code) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_line_number, 0, 0, 1) ZEND_ARG_INFO(0, parser) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_column_number, 0, 0, 1) ZEND_ARG_INFO(0, parser) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_byte_index, 0, 0, 1) ZEND_ARG_INFO(0, parser) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_free, 0, 0, 1) ZEND_ARG_INFO(0, parser) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_set_option, 0, 0, 3) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, option) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_get_option, 0, 0, 2) ZEND_ARG_INFO(0, parser) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_utf8_encode, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_utf8_decode, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14.2.9.2.7&r2=1.13.2.14.2.9.2.8&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9.2.7 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9.2.8 --- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9.2.7 Fri Oct 24 14:35:39 2008 +++ php-src/ext/xmlreader/php_xmlreader.c Sun Nov 2 21:19:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.13.2.14.2.9.2.7 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.14.2.9.2.8 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1170,100 +1170,125 @@ } /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_close, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getAttribute, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getAttributeNo, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getAttributeNs, 0) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, namespaceURI) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getParserProperty, 0) ZEND_ARG_INFO(0, property) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_isValid, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_lookupNamespace, 0) ZEND_ARG_INFO(0, prefix) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToAttribute, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToAttributeNo, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToAttributeNs, 0) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, namespaceURI) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToElement, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToFirstAttribute, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToNextAttribute, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_read, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_next, 0, 0, 0) ZEND_ARG_INFO(0, localname) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_open, 0, 0, 1) ZEND_ARG_INFO(0, URI) ZEND_ARG_INFO(0, encoding) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_readInnerXml, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_readOuterXml, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_readString, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setSchema, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setParserProperty, 0) ZEND_ARG_INFO(0, property) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setRelaxNGSchema, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setRelaxNGSchemaSource, 0) ZEND_ARG_INFO(0, source) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_XML, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, encoding) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_expand, 0) ZEND_END_ARG_INFO() /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6.2.14&r2=1.39.2.5.2.6.2.15&diff_format=u Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.14 php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.15 --- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.14 Fri Oct 24 14:35:39 2008 +++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Sun Nov 2 21:19:38 2008 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.14 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.15 2008/11/02 21:19:38 felipe Exp $ */ /********************************************************************** * BUGS: * @@ -76,49 +76,59 @@ static int le_xmlrpc_server; /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_encode, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_decode, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_decode_request, 0, 0, 2) ZEND_ARG_INFO(0, xml) ZEND_ARG_INFO(1, method) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_encode_request, 0, 0, 2) ZEND_ARG_INFO(0, method) ZEND_ARG_INFO(0, params) ZEND_ARG_INFO(0, output_options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_set_type, 0, 0, 2) ZEND_ARG_INFO(1, value) ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_is_fault, 0, 0, 1) ZEND_ARG_INFO(0, arg) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_xmlrpc_server_create, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_destroy, 0, 0, 1) ZEND_ARG_INFO(0, server) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_register_method, 0, 0, 3) ZEND_ARG_INFO(0, server) ZEND_ARG_INFO(0, method_name) ZEND_ARG_INFO(0, function) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_call_method, 0, 0, 3) ZEND_ARG_INFO(0, server) ZEND_ARG_INFO(0, xml) @@ -126,15 +136,18 @@ ZEND_ARG_INFO(0, output_options) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_parse_method_descriptions, 0, 0, 1) ZEND_ARG_INFO(0, xml) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_add_introspection_data, 0, 0, 2) ZEND_ARG_INFO(0, server) ZEND_ARG_INFO(0, desc) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_register_introspection_callback, 0, 0, 2) ZEND_ARG_INFO(0, server) ZEND_ARG_INFO(0, function) http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15.2.7&r2=1.20.2.12.2.15.2.8&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.7 php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.8 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.7 Fri Oct 24 14:35:39 2008 +++ php-src/ext/xmlwriter/php_xmlwriter.c Sun Nov 2 21:19:38 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.7 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.8 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -173,44 +173,54 @@ } \ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_xmlwriter_void, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_resource, 0, 0, 1) ZEND_ARG_INFO(0, xmlwriter) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_open_uri, 0, 0, 1) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_set_indent, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, indent) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_set_indent, 0, 0, 1) ZEND_ARG_INFO(0, indent) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_set_indent_string, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, indentString) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_set_indent_string, 0, 0, 1) ZEND_ARG_INFO(0, indentString) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_attribute, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_attribute, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_attribute_ns, 0, 0, 4) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, prefix) @@ -218,12 +228,14 @@ ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_attribute_ns, 0, 0, 3) ZEND_ARG_INFO(0, prefix) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_attribute_ns, 0, 0, 5) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, prefix) @@ -232,6 +244,7 @@ ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_attribute_ns, 0, 0, 4) ZEND_ARG_INFO(0, prefix) ZEND_ARG_INFO(0, name) @@ -239,26 +252,31 @@ ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_attribute, 0, 0, 3) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_attribute, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_element, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_element, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_element_ns, 0, 0, 4) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, prefix) @@ -266,23 +284,27 @@ ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_element_ns, 0, 0, 3) ZEND_ARG_INFO(0, prefix) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_element, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_element, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_element_ns, 0, 0, 4) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, prefix) @@ -291,6 +313,7 @@ ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_element_ns, 0, 0, 3) ZEND_ARG_INFO(0, prefix) ZEND_ARG_INFO(0, name) @@ -298,53 +321,64 @@ ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_pi, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, target) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_pi, 0, 0, 1) ZEND_ARG_INFO(0, target) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_pi, 0, 0, 3) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, target) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_pi, 0, 0, 2) ZEND_ARG_INFO(0, target) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_cdata, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_cdata, 0, 0, 1) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_text, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_text, 0, 0, 1) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_raw, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_raw, 0, 0, 1) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_document, 0, 0, 1) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, version) @@ -352,21 +386,25 @@ ZEND_ARG_INFO(0, standalone) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_document, 0, 0, 0) ZEND_ARG_INFO(0, version) ZEND_ARG_INFO(0, encoding) ZEND_ARG_INFO(0, standalone) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_comment, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_comment, 0, 0, 1) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, qualifiedName) @@ -374,12 +412,14 @@ ZEND_ARG_INFO(0, systemId) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd, 0, 0, 1) ZEND_ARG_INFO(0, qualifiedName) ZEND_ARG_INFO(0, publicId) ZEND_ARG_INFO(0, systemId) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) @@ -388,6 +428,7 @@ ZEND_ARG_INFO(0, subset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, publicId) @@ -395,82 +436,98 @@ ZEND_ARG_INFO(0, subset) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd_element, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, qualifiedName) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd_element, 0, 0, 1) ZEND_ARG_INFO(0, qualifiedName) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd_element, 0, 0, 3) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd_element, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd_attlist, 0, 0, 2) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd_attlist, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd_attlist, 0, 0, 3) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd_attlist, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd_entity, 0, 0, 3) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, isparam) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd_entity, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, isparam) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd_entity, 0, 0, 3) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd_entity, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, content) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_output_memory, 0, 0, 1) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, flush) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_output_memory, 0, 0, 0) ZEND_ARG_INFO(0, flush) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_flush, 0, 0, 1) ZEND_ARG_INFO(0, xmlwriter) ZEND_ARG_INFO(0, empty) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_flush, 0, 0, 0) ZEND_ARG_INFO(0, empty) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.10&r2=1.39.2.2.2.9.2.11&diff_format=u Index: php-src/ext/xsl/xsltprocessor.c diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.10 php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.11 --- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.10 Fri Oct 24 14:35:39 2008 +++ php-src/ext/xsl/xsltprocessor.c Sun Nov 2 21:19:38 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.10 2008/10/24 14:35:39 felipe Exp $ */ +/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.11 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -28,46 +28,56 @@ #include "ext/libxml/php_libxml.h" /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2) ZEND_ARG_INFO(0, namespace) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2) ZEND_ARG_INFO(0, namespace) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2) ZEND_ARG_INFO(0, namespace) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 0) ZEND_ARG_INFO(0, restrict) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_profiling, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO(); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.21&r2=1.1.2.38.2.22&diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.21 php-src/ext/zip/php_zip.c:1.1.2.38.2.22 --- php-src/ext/zip/php_zip.c:1.1.2.38.2.21 Fri Oct 24 14:35:40 2008 +++ php-src/ext/zip/php_zip.c Sun Nov 2 21:19:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.38.2.21 2008/10/24 14:35:40 felipe Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38.2.22 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -668,45 +668,55 @@ #endif /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_close, 0, 0, 1) ZEND_ARG_INFO(0, zip) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_read, 0, 0, 1) ZEND_ARG_INFO(0, zip) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_open, 0, 0, 2) ZEND_ARG_INFO(0, zip_dp) ZEND_ARG_INFO(0, zip_entry) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_close, 0, 0, 1) ZEND_ARG_INFO(0, zip_ent) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_read, 0, 0, 1) ZEND_ARG_INFO(0, zip_entry) ZEND_ARG_INFO(0, len) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_name, 0, 0, 1) ZEND_ARG_INFO(0, zip_entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_compressedsize, 0, 0, 1) ZEND_ARG_INFO(0, zip_entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_filesize, 0, 0, 1) ZEND_ARG_INFO(0, zip_entry) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_compressionmethod, 0, 0, 1) ZEND_ARG_INFO(0, zip_entry) ZEND_END_ARG_INFO() @@ -2673,7 +2683,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Zip", "enabled"); - php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38.2.21 2008/10/24 14:35:40 felipe Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38.2.22 2008/11/02 21:19:38 felipe Exp $"); php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING); php_info_print_table_row(2, "Libzip version", "0.9.0"); http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.6&r2=1.183.2.6.2.5.2.7&diff_format=u Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.6 php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.7 --- php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.6 Fri Oct 24 14:35:40 2008 +++ php-src/ext/zlib/zlib.c Sun Nov 2 21:19:38 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.183.2.6.2.5.2.6 2008/10/24 14:35:40 felipe Exp $ */ +/* $Id: zlib.c,v 1.183.2.6.2.5.2.7 2008/11/02 21:19:38 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -102,51 +102,61 @@ static PHP_FUNCTION(zlib_get_coding_type); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gzfile, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, use_include_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gzopen, 0, 0, 2) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, use_include_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_readgzfile, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, use_include_path) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gzcompress, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, level) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gzuncompress, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gzdeflate, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, level) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gzinflate, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_zlib_get_coding_type, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_gzencode, 0, 0, 1) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, level) ZEND_ARG_INFO(0, encoding_mode) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_gzhandler, 0, 0, 2) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, mode) http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.81.2.2.2.1.2.5&r2=1.81.2.2.2.1.2.6&diff_format=u Index: php-src/sapi/aolserver/aolserver.c diff -u php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.5 php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.6 --- php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.5 Fri Oct 24 16:03:14 2008 +++ php-src/sapi/aolserver/aolserver.c Sun Nov 2 21:19:38 2008 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.81.2.2.2.1.2.5 2008/10/24 16:03:14 felipe Exp $ */ +/* $Id: aolserver.c,v 1.81.2.2.2.1.2.6 2008/11/02 21:19:38 felipe Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.81.2.2.2.1.2.5 2008/10/24 16:03:14 felipe Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.81.2.2.2.1.2.6 2008/11/02 21:19:38 felipe Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -241,6 +241,7 @@ PHP_FUNCTION(getallheaders); /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_aolserver_getallheaders, 0) ZEND_END_ARG_INFO() /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.6.2.6&r2=1.89.2.4.2.6.2.7&diff_format=u Index: php-src/sapi/apache/php_apache.c diff -u php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.6 php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.7 --- php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.6 Fri Oct 24 16:03:15 2008 +++ php-src/sapi/apache/php_apache.c Sun Nov 2 21:19:38 2008 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.89.2.4.2.6.2.6 2008/10/24 16:03:15 felipe Exp $ */ +/* $Id: php_apache.c,v 1.89.2.4.2.6.2.7 2008/11/02 21:19:38 felipe Exp $ */ #include "php_apache_http.h" @@ -56,40 +56,50 @@ PHP_MINFO_FUNCTION(apache); +static ZEND_BEGIN_ARG_INFO(arginfo_apache_child_terminate, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_note, 0, 0, 1) ZEND_ARG_INFO(0, note_name) ZEND_ARG_INFO(0, note_value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_virtual, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache_request_headers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache_response_headers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_setenv, 0, 0, 2) ZEND_ARG_INFO(0, variable) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, walk_to_top) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_lookup_uri, 0, 0, 1) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache_get_version, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache_get_modules, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache_reset_timeout, 0) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.44.2.2.2.2.2.4&r2=1.44.2.2.2.2.2.5&diff_format=u Index: php-src/sapi/apache2filter/php_functions.c diff -u php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.4 php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.5 --- php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.4 Fri Oct 24 16:03:15 2008 +++ php-src/sapi/apache2filter/php_functions.c Sun Nov 2 21:19:39 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.44.2.2.2.2.2.4 2008/10/24 16:03:15 felipe Exp $ */ +/* $Id: php_functions.c,v 1.44.2.2.2.2.2.5 2008/11/02 21:19:39 felipe Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -360,39 +360,48 @@ } /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_lookup_uri, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_virtual, 0, 0, 1) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_getallheaders, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_response_headers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_note, 0, 0, 1) ZEND_ARG_INFO(0, note_name) ZEND_ARG_INFO(0, note_value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_setenv, 0, 0, 2) ZEND_ARG_INFO(0, variable) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, walk_to_top) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_getenv, 0, 0, 1) ZEND_ARG_INFO(0, variable) ZEND_ARG_INFO(0, walk_to_top) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_get_version, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_get_modules, 0) ZEND_END_ARG_INFO() /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.6&r2=1.18.2.6.2.5.2.7&diff_format=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.6 php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.7 --- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.6 Fri Oct 24 16:03:15 2008 +++ php-src/sapi/apache2handler/php_functions.c Sun Nov 2 21:19:39 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.18.2.6.2.5.2.6 2008/10/24 16:03:15 felipe Exp $ */ +/* $Id: php_functions.c,v 1.18.2.6.2.5.2.7 2008/11/02 21:19:39 felipe Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -469,39 +469,48 @@ } /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_lookup_uri, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_virtual, 0, 0, 1) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_response_headers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_getallheaders, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_note, 0, 0, 1) ZEND_ARG_INFO(0, note_name) ZEND_ARG_INFO(0, note_value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_setenv, 0, 0, 2) ZEND_ARG_INFO(0, variable) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, walk_to_top) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_getenv, 0, 0, 1) ZEND_ARG_INFO(0, variable) ZEND_ARG_INFO(0, walk_to_top) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_version, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_modules, 0) ZEND_END_ARG_INFO() /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.5&r2=1.19.2.3.2.5.2.6&diff_format=u Index: php-src/sapi/apache_hooks/php_apache.c diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.5 php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.6 --- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.5 Fri Oct 24 16:03:15 2008 +++ php-src/sapi/apache_hooks/php_apache.c Sun Nov 2 21:19:39 2008 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.19.2.3.2.5.2.5 2008/10/24 16:03:15 felipe Exp $ */ +/* $Id: php_apache.c,v 1.19.2.3.2.5.2.6 2008/11/02 21:19:39 felipe Exp $ */ #include "php_apache_http.h" @@ -59,38 +59,48 @@ PHP_MINFO_FUNCTION(apache); +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_virtual, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_headers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_response_headers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_setenv, 0, 0, 2) ZEND_ARG_INFO(0, variable) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, walk_to_top) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_lookup_uri, 0, 0, 1) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_version, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_modules, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_run, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_child_terminate, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_note, 0, 0, 1) ZEND_ARG_INFO(0, note_name) ZEND_ARG_INFO(0, note_value) http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.14.2.2.2.3.2.7&r2=1.14.2.2.2.3.2.8&diff_format=u Index: php-src/sapi/milter/php_milter.c diff -u php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.7 php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.8 --- php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.7 Fri Oct 24 16:03:15 2008 +++ php-src/sapi/milter/php_milter.c Sun Nov 2 21:19:39 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_milter.c,v 1.14.2.2.2.3.2.7 2008/10/24 16:03:15 felipe Exp $ */ +/* $Id: php_milter.c,v 1.14.2.2.2.3.2.8 2008/11/02 21:19:39 felipe Exp $ */ #include "php.h" #include "php_globals.h" @@ -770,42 +770,51 @@ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setflags, 0, 0, 1) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_settimeout, 0, 0, 1) ZEND_ARG_INFO(0, timeout) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_getsymval, 0, 0, 1) ZEND_ARG_INFO(0, macro) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setreply, 0, 0, 3) ZEND_ARG_INFO(0, rcode) ZEND_ARG_INFO(0, xcode) ZEND_ARG_INFO(0, message) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addheader, 0, 0, 2) ZEND_ARG_INFO(0, headerf) ZEND_ARG_INFO(0, headerv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_chgheader, 0, 0, 2) ZEND_ARG_INFO(0, headerf) ZEND_ARG_INFO(0, headerv) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addrcpt, 0, 0, 1) ZEND_ARG_INFO(0, rcpt) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_delrcpt, 0, 0, 1) ZEND_ARG_INFO(0, rcpt) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_replacebody, 0, 0, 1) ZEND_ARG_INFO(0, body) ZEND_END_ARG_INFO() http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.7&r2=1.69.2.3.2.6.2.8&diff_format=u Index: php-src/sapi/nsapi/nsapi.c diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.7 php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.8 --- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.7 Fri Oct 24 16:03:15 2008 +++ php-src/sapi/nsapi/nsapi.c Sun Nov 2 21:19:39 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.69.2.3.2.6.2.7 2008/10/24 16:03:15 felipe Exp $ */ +/* $Id: nsapi.c,v 1.69.2.3.2.6.2.8 2008/11/02 21:19:39 felipe Exp $ */ /* * PHP includes @@ -170,13 +170,16 @@ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_nsapi_virtual, 0, 0, 1) ZEND_ARG_INFO(0, uri) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_nsapi_request_headers, 0) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_nsapi_response_headers, 0) ZEND_END_ARG_INFO() /* }}} */ @@ -321,7 +324,7 @@ PHP_MINFO_FUNCTION(nsapi) { php_info_print_table_start(); - php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.69.2.3.2.6.2.7 $"); + php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.69.2.3.2.6.2.8 $"); php_info_print_table_row(2, "Server Software", system_version()); php_info_print_table_row(2, "Sub-requests with nsapi_virtual()", (nsapi_servact_service)?((zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0))?"not supported with zlib.output_compression":"enabled"):"not supported on this platform" ); http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/skip.ini?view=markup&rev=1.1 Index: php-src/ext/pcre/tests/skip.ini +++ php-src/ext/pcre/tests/skip.ini http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/skip_001.inc?view=markup&rev=1.1 Index: php-src/ext/pcre/tests/skip_001.inc +++ php-src/ext/pcre/tests/skip_001.inc http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/skip_002.inc?view=markup&rev=1.1 Index: php-src/ext/pcre/tests/skip_002.inc +++ php-src/ext/pcre/tests/skip_002.inc http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/skip_003.inc?view=markup&rev=1.1 Index: php-src/ext/pcre/tests/skip_003.inc +++ php-src/ext/pcre/tests/skip_003.inc