cvs: php-src(PHP_5_3) /ext/recode recode.c /ext/shmop shmop.c /ext/spl php_spl.c /ext/tidy tidy.c /ext/zip php_zip.c /ext/zlib zlib.c
| From: | Felipe Pena | Date: | Thu, 03 Jul 2008 01:55:48 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/recode recode.c /ext/shmop shmop.c /ext/spl php_spl.c /ext/tidy tidy.c /ext/zip php_zip.c /ext/zlib zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50762@lists.php.net to get a copy of this message | ||
felipe Thu Jul 3 01:55:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/recode recode.c
/php-src/ext/shmop shmop.c
/php-src/ext/spl php_spl.c
/php-src/ext/tidy tidy.c
/php-src/ext/zip php_zip.c
/php-src/ext/zlib zlib.c
Log:
- Added arginfo (functions)
http://cvs.php.net/viewvc.cgi/php-src/ext/recode/recode.c?r1=1.37.2.1.2.3.2.2&r2=1.37.2.1.2.3.2.3&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.2 php-src/ext/recode/recode.c:1.37.2.1.2.3.2.3 --- php-src/ext/recode/recode.c:1.37.2.1.2.3.2.2 Mon Dec 31 07:17:12 2007 +++ php-src/ext/recode/recode.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.37.2.1.2.3.2.2 2007/12/31 07:17:12 sebastian Exp $ */ +/* $Id: recode.c,v 1.37.2.1.2.3.2.3 2008/07/03 01:55:47 felipe Exp $ */ /* {{{ includes & prototypes */ @@ -66,11 +66,26 @@ ZEND_DECLARE_MODULE_GLOBALS(recode); 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) + ZEND_ARG_INFO(0, output) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ module stuff */ static const zend_function_entry php_recode_functions[] = { - PHP_FE(recode_string, NULL) - PHP_FE(recode_file, NULL) - PHP_FALIAS(recode, recode_string, NULL) + PHP_FE(recode_string, arginfo_recode_string) + PHP_FE(recode_file, arginfo_recode_file) + PHP_FALIAS(recode, recode_string, arginfo_recode_string) {NULL, NULL, NULL} }; @@ -122,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.2 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.37.2.1.2.3.2.3 $"); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.31.2.2.2.5.2.3&r2=1.31.2.2.2.5.2.4&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.3 php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.4 --- php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.3 Sun Jan 27 17:00:37 2008 +++ php-src/ext/shmop/shmop.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.31.2.2.2.5.2.3 2008/01/27 17:00:37 iliaa Exp $ */ +/* $Id: shmop.c,v 1.31.2.2.2.5.2.4 2008/07/03 01:55:47 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -45,15 +45,54 @@ 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) + ZEND_ARG_INFO(0, mode) + 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() +/* }}} */ + /* {{{ shmop_functions[] */ const zend_function_entry shmop_functions[] = { - PHP_FE(shmop_open, NULL) - PHP_FE(shmop_read, NULL) - PHP_FE(shmop_close, NULL) - PHP_FE(shmop_size, NULL) - PHP_FE(shmop_write, NULL) - PHP_FE(shmop_delete, NULL) + PHP_FE(shmop_open, arginfo_shmop_open) + PHP_FE(shmop_read, arginfo_shmop_read) + PHP_FE(shmop_close, arginfo_shmop_close) + PHP_FE(shmop_size, arginfo_shmop_size) + PHP_FE(shmop_write, arginfo_shmop_write) + PHP_FE(shmop_delete, arginfo_shmop_delete) {NULL, NULL, NULL} /* Must be the last line in shmop_functions[] */ }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.19&r2=1.52.2.28.2.17.2.20&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.19 php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.20 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.19 Wed Jun 18 14:54:39 2008 +++ php-src/ext/spl/php_spl.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.17.2.19 2008/06/18 14:54:39 colder Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.17.2.20 2008/07/03 01:55:47 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -731,6 +731,7 @@ } /* }}} */ +/* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_iterator_to_array, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) @@ -749,19 +750,70 @@ 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() +/* }}} */ + /* {{{ spl_functions */ const zend_function_entry spl_functions[] = { - PHP_FE(spl_classes, NULL) - PHP_FE(spl_autoload, NULL) - PHP_FE(spl_autoload_extensions, NULL) - PHP_FE(spl_autoload_register, NULL) - PHP_FE(spl_autoload_unregister, NULL) - PHP_FE(spl_autoload_functions, NULL) - PHP_FE(spl_autoload_call, NULL) - PHP_FE(class_parents, NULL) - PHP_FE(class_implements, NULL) - PHP_FE(spl_object_hash, NULL) + PHP_FE(spl_classes, arginfo_spl_classes) + PHP_FE(spl_autoload, arginfo_spl_autoload) + PHP_FE(spl_autoload_extensions, arginfo_spl_autoload_extensions) + PHP_FE(spl_autoload_register, arginfo_spl_autoload_register) + PHP_FE(spl_autoload_unregister, arginfo_spl_autoload_unregister) + PHP_FE(spl_autoload_functions, arginfo_spl_autoload_functions) + PHP_FE(spl_autoload_call, arginfo_spl_autoload_call) + PHP_FE(class_parents, arginfo_class_parents) + PHP_FE(class_implements, arginfo_class_implements) + PHP_FE(spl_object_hash, arginfo_spl_object_hash) #ifdef SPL_ITERATORS_H PHP_FE(iterator_to_array, arginfo_iterator_to_array) PHP_FE(iterator_count, arginfo_iterator) http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.24.2.6&r2=1.66.2.8.2.24.2.7&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.6 php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.7 --- php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.6 Mon Mar 10 22:12:36 2008 +++ php-src/ext/tidy/tidy.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.66.2.8.2.24.2.6 2008/03/10 22:12:36 felipe Exp $ */ +/* $Id: tidy.c,v 1.66.2.8.2.24.2.7 2008/07/03 01:55:47 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -277,34 +277,159 @@ PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_PERDIR, NULL) 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) + ZEND_ARG_INFO(0, encoding) + 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) + ZEND_ARG_INFO(0, encoding) + 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) +ZEND_END_ARG_INFO() +/* }}} */ + static const zend_function_entry tidy_functions[] = { - PHP_FE(tidy_getopt, NULL) - PHP_FE(tidy_parse_string, NULL) - PHP_FE(tidy_parse_file, NULL) - PHP_FE(tidy_get_output, NULL) - PHP_FE(tidy_get_error_buffer, NULL) - PHP_FE(tidy_clean_repair, NULL) - PHP_FE(tidy_repair_string, NULL) - PHP_FE(tidy_repair_file, NULL) - PHP_FE(tidy_diagnose, NULL) - PHP_FE(tidy_get_release, NULL) - PHP_FE(tidy_get_config, NULL) - PHP_FE(tidy_get_status, NULL) - PHP_FE(tidy_get_html_ver, NULL) - PHP_FE(tidy_is_xhtml, NULL) - PHP_FE(tidy_is_xml, NULL) - PHP_FE(tidy_error_count, NULL) - PHP_FE(tidy_warning_count, NULL) - PHP_FE(tidy_access_count, NULL) - PHP_FE(tidy_config_count, NULL) + PHP_FE(tidy_getopt, arginfo_tidy_getopt) + PHP_FE(tidy_parse_string, arginfo_tidy_parse_string) + PHP_FE(tidy_parse_file, arginfo_tidy_parse_file) + PHP_FE(tidy_get_output, arginfo_tidy_get_output) + PHP_FE(tidy_get_error_buffer, arginfo_tidy_get_error_buffer) + PHP_FE(tidy_clean_repair, arginfo_tidy_clean_repair) + PHP_FE(tidy_repair_string, arginfo_tidy_repair_string) + PHP_FE(tidy_repair_file, arginfo_tidy_repair_file) + PHP_FE(tidy_diagnose, arginfo_tidy_diagnose) + PHP_FE(tidy_get_release, arginfo_tidy_get_release) + PHP_FE(tidy_get_config, arginfo_tidy_get_config) + PHP_FE(tidy_get_status, arginfo_tidy_get_status) + PHP_FE(tidy_get_html_ver, arginfo_tidy_get_html_ver) + PHP_FE(tidy_is_xhtml, arginfo_tidy_is_xhtml) + PHP_FE(tidy_is_xml, arginfo_tidy_is_xml) + PHP_FE(tidy_error_count, arginfo_tidy_error_count) + PHP_FE(tidy_warning_count, arginfo_tidy_warning_count) + PHP_FE(tidy_access_count, arginfo_tidy_access_count) + PHP_FE(tidy_config_count, arginfo_tidy_config_count) #if HAVE_TIDYOPTGETDOC - PHP_FE(tidy_get_opt_doc, NULL) + PHP_FE(tidy_get_opt_doc, arginfo_tidy_get_opt_doc) #endif - PHP_FE(tidy_get_root, NULL) - PHP_FE(tidy_get_head, NULL) - PHP_FE(tidy_get_html, NULL) - PHP_FE(tidy_get_body, NULL) - PHP_FE(ob_tidyhandler, NULL) + PHP_FE(tidy_get_root, arginfo_tidy_get_root) + PHP_FE(tidy_get_head, arginfo_tidy_get_head) + PHP_FE(tidy_get_html, arginfo_tidy_get_html) + PHP_FE(tidy_get_body, arginfo_tidy_get_body) + PHP_FE(ob_tidyhandler, arginfo_ob_tidyhandler) {NULL, NULL, NULL} }; @@ -998,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.6 2008/03/10 22:12:36 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.7 2008/07/03 01:55:47 felipe Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.9&r2=1.1.2.38.2.10&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.9 php-src/ext/zip/php_zip.c:1.1.2.38.2.10 --- php-src/ext/zip/php_zip.c:1.1.2.38.2.9 Wed May 21 09:27:41 2008 +++ php-src/ext/zip/php_zip.c Thu Jul 3 01:55:48 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.38.2.9 2008/05/21 09:27:41 pajoye Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38.2.10 2008/07/03 01:55:48 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -607,18 +607,73 @@ #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() +/* }}} */ + /* {{{ zend_function_entry */ static zend_function_entry zip_functions[] = { - ZEND_RAW_FENTRY("zip_open", zif_zip_open, NULL, 0) - ZEND_RAW_FENTRY("zip_close", zif_zip_close, NULL, 0) - ZEND_RAW_FENTRY("zip_read", zif_zip_read, NULL, 0) - PHP_FE(zip_entry_open, NULL) - PHP_FE(zip_entry_close, NULL) - PHP_FE(zip_entry_read, NULL) - PHP_FE(zip_entry_filesize, NULL) - PHP_FE(zip_entry_name, NULL) - PHP_FE(zip_entry_compressedsize, NULL) - PHP_FE(zip_entry_compressionmethod, NULL) + ZEND_RAW_FENTRY("zip_open", zif_zip_open, arginfo_zip_open, 0) + ZEND_RAW_FENTRY("zip_close", zif_zip_close, arginfo_zip_close, 0) + ZEND_RAW_FENTRY("zip_read", zif_zip_read, arginfo_zip_read, 0) + PHP_FE(zip_entry_open, arginfo_zip_entry_open) + PHP_FE(zip_entry_close, arginfo_zip_entry_close) + PHP_FE(zip_entry_read, arginfo_zip_entry_read) + PHP_FE(zip_entry_filesize, arginfo_zip_entry_filesize) + PHP_FE(zip_entry_name, arginfo_zip_entry_name) + PHP_FE(zip_entry_compressedsize, arginfo_zip_entry_compressedsize) + PHP_FE(zip_entry_compressionmethod, arginfo_zip_entry_compressionmethod) {NULL, NULL, NULL} }; @@ -2551,7 +2606,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.9 2008/05/21 09:27:41 pajoye Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38.2.10 2008/07/03 01:55:48 felipe Exp $"); php_info_print_table_row(2, "Zip version", "@PACKAGE_VERSION@"); php_info_print_table_row(2, "Libzip version", "0.7.1"); http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.2&r2=1.183.2.6.2.5.2.3&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.2 php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.3 --- php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.2 Mon Dec 31 07:17:17 2007 +++ php-src/ext/zlib/zlib.c Thu Jul 3 01:55:48 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.183.2.6.2.5.2.2 2007/12/31 07:17:17 sebastian Exp $ */ +/* $Id: zlib.c,v 1.183.2.6.2.5.2.3 2008/07/03 01:55:48 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -101,10 +101,72 @@ static PHP_FUNCTION(ob_gzhandler); 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) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ php_zlib_functions[] */ static const zend_function_entry php_zlib_functions[] = { - PHP_FE(readgzfile, NULL) + PHP_FE(readgzfile, arginfo_readgzfile) PHP_FALIAS(gzrewind, rewind, NULL) PHP_FALIAS(gzclose, fclose, NULL) PHP_FALIAS(gzeof, feof, NULL) @@ -112,20 +174,20 @@ PHP_FALIAS(gzgets, fgets, NULL) PHP_FALIAS(gzgetss, fgetss, NULL) PHP_FALIAS(gzread, fread, NULL) - PHP_FE(gzopen, NULL) + PHP_FE(gzopen, arginfo_gzopen) PHP_FALIAS(gzpassthru, fpassthru, NULL) PHP_FALIAS(gzseek, fseek, NULL) PHP_FALIAS(gztell, ftell, NULL) PHP_FALIAS(gzwrite, fwrite, NULL) PHP_FALIAS(gzputs, fwrite, NULL) - PHP_FE(gzfile, NULL) - PHP_FE(gzcompress, NULL) - PHP_FE(gzuncompress, NULL) - PHP_FE(gzdeflate, NULL) - PHP_FE(gzinflate, NULL) - PHP_FE(gzencode, NULL) - PHP_FE(ob_gzhandler, NULL) - PHP_FE(zlib_get_coding_type, NULL) + PHP_FE(gzfile, arginfo_gzfile) + PHP_FE(gzcompress, arginfo_gzcompress) + PHP_FE(gzuncompress, arginfo_gzuncompress) + PHP_FE(gzdeflate, arginfo_gzdeflate) + PHP_FE(gzinflate, arginfo_gzinflate) + PHP_FE(gzencode, arginfo_gzencode) + PHP_FE(ob_gzhandler, arginfo_ob_gzhandler) + PHP_FE(zlib_get_coding_type, arginfo_zlib_get_coding_type) {NULL, NULL, NULL} }; /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/recode/recode.c?r1=1.37.2.1.2.3.2.2&r2=1.37.2.1.2.3.2.3&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.2 php-src/ext/recode/recode.c:1.37.2.1.2.3.2.3 --- php-src/ext/recode/recode.c:1.37.2.1.2.3.2.2 Mon Dec 31 07:17:12 2007 +++ php-src/ext/recode/recode.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.37.2.1.2.3.2.2 2007/12/31 07:17:12 sebastian Exp $ */ +/* $Id: recode.c,v 1.37.2.1.2.3.2.3 2008/07/03 01:55:47 felipe Exp $ */ /* {{{ includes & prototypes */ @@ -66,11 +66,26 @@ ZEND_DECLARE_MODULE_GLOBALS(recode); 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) + ZEND_ARG_INFO(0, output) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ module stuff */ static const zend_function_entry php_recode_functions[] = { - PHP_FE(recode_string, NULL) - PHP_FE(recode_file, NULL) - PHP_FALIAS(recode, recode_string, NULL) + PHP_FE(recode_string, arginfo_recode_string) + PHP_FE(recode_file, arginfo_recode_file) + PHP_FALIAS(recode, recode_string, arginfo_recode_string) {NULL, NULL, NULL} }; @@ -122,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.2 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.37.2.1.2.3.2.3 $"); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.31.2.2.2.5.2.3&r2=1.31.2.2.2.5.2.4&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.3 php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.4 --- php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.3 Sun Jan 27 17:00:37 2008 +++ php-src/ext/shmop/shmop.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.31.2.2.2.5.2.3 2008/01/27 17:00:37 iliaa Exp $ */ +/* $Id: shmop.c,v 1.31.2.2.2.5.2.4 2008/07/03 01:55:47 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -45,15 +45,54 @@ 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) + ZEND_ARG_INFO(0, mode) + 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() +/* }}} */ + /* {{{ shmop_functions[] */ const zend_function_entry shmop_functions[] = { - PHP_FE(shmop_open, NULL) - PHP_FE(shmop_read, NULL) - PHP_FE(shmop_close, NULL) - PHP_FE(shmop_size, NULL) - PHP_FE(shmop_write, NULL) - PHP_FE(shmop_delete, NULL) + PHP_FE(shmop_open, arginfo_shmop_open) + PHP_FE(shmop_read, arginfo_shmop_read) + PHP_FE(shmop_close, arginfo_shmop_close) + PHP_FE(shmop_size, arginfo_shmop_size) + PHP_FE(shmop_write, arginfo_shmop_write) + PHP_FE(shmop_delete, arginfo_shmop_delete) {NULL, NULL, NULL} /* Must be the last line in shmop_functions[] */ }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.19&r2=1.52.2.28.2.17.2.20&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.19 php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.20 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.19 Wed Jun 18 14:54:39 2008 +++ php-src/ext/spl/php_spl.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.17.2.19 2008/06/18 14:54:39 colder Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.17.2.20 2008/07/03 01:55:47 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -731,6 +731,7 @@ } /* }}} */ +/* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_iterator_to_array, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) @@ -749,19 +750,70 @@ 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() +/* }}} */ + /* {{{ spl_functions */ const zend_function_entry spl_functions[] = { - PHP_FE(spl_classes, NULL) - PHP_FE(spl_autoload, NULL) - PHP_FE(spl_autoload_extensions, NULL) - PHP_FE(spl_autoload_register, NULL) - PHP_FE(spl_autoload_unregister, NULL) - PHP_FE(spl_autoload_functions, NULL) - PHP_FE(spl_autoload_call, NULL) - PHP_FE(class_parents, NULL) - PHP_FE(class_implements, NULL) - PHP_FE(spl_object_hash, NULL) + PHP_FE(spl_classes, arginfo_spl_classes) + PHP_FE(spl_autoload, arginfo_spl_autoload) + PHP_FE(spl_autoload_extensions, arginfo_spl_autoload_extensions) + PHP_FE(spl_autoload_register, arginfo_spl_autoload_register) + PHP_FE(spl_autoload_unregister, arginfo_spl_autoload_unregister) + PHP_FE(spl_autoload_functions, arginfo_spl_autoload_functions) + PHP_FE(spl_autoload_call, arginfo_spl_autoload_call) + PHP_FE(class_parents, arginfo_class_parents) + PHP_FE(class_implements, arginfo_class_implements) + PHP_FE(spl_object_hash, arginfo_spl_object_hash) #ifdef SPL_ITERATORS_H PHP_FE(iterator_to_array, arginfo_iterator_to_array) PHP_FE(iterator_count, arginfo_iterator) http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.24.2.6&r2=1.66.2.8.2.24.2.7&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.6 php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.7 --- php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.6 Mon Mar 10 22:12:36 2008 +++ php-src/ext/tidy/tidy.c Thu Jul 3 01:55:47 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.66.2.8.2.24.2.6 2008/03/10 22:12:36 felipe Exp $ */ +/* $Id: tidy.c,v 1.66.2.8.2.24.2.7 2008/07/03 01:55:47 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -277,34 +277,159 @@ PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_PERDIR, NULL) 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) + ZEND_ARG_INFO(0, encoding) + 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) + ZEND_ARG_INFO(0, encoding) + 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) +ZEND_END_ARG_INFO() +/* }}} */ + static const zend_function_entry tidy_functions[] = { - PHP_FE(tidy_getopt, NULL) - PHP_FE(tidy_parse_string, NULL) - PHP_FE(tidy_parse_file, NULL) - PHP_FE(tidy_get_output, NULL) - PHP_FE(tidy_get_error_buffer, NULL) - PHP_FE(tidy_clean_repair, NULL) - PHP_FE(tidy_repair_string, NULL) - PHP_FE(tidy_repair_file, NULL) - PHP_FE(tidy_diagnose, NULL) - PHP_FE(tidy_get_release, NULL) - PHP_FE(tidy_get_config, NULL) - PHP_FE(tidy_get_status, NULL) - PHP_FE(tidy_get_html_ver, NULL) - PHP_FE(tidy_is_xhtml, NULL) - PHP_FE(tidy_is_xml, NULL) - PHP_FE(tidy_error_count, NULL) - PHP_FE(tidy_warning_count, NULL) - PHP_FE(tidy_access_count, NULL) - PHP_FE(tidy_config_count, NULL) + PHP_FE(tidy_getopt, arginfo_tidy_getopt) + PHP_FE(tidy_parse_string, arginfo_tidy_parse_string) + PHP_FE(tidy_parse_file, arginfo_tidy_parse_file) + PHP_FE(tidy_get_output, arginfo_tidy_get_output) + PHP_FE(tidy_get_error_buffer, arginfo_tidy_get_error_buffer) + PHP_FE(tidy_clean_repair, arginfo_tidy_clean_repair) + PHP_FE(tidy_repair_string, arginfo_tidy_repair_string) + PHP_FE(tidy_repair_file, arginfo_tidy_repair_file) + PHP_FE(tidy_diagnose, arginfo_tidy_diagnose) + PHP_FE(tidy_get_release, arginfo_tidy_get_release) + PHP_FE(tidy_get_config, arginfo_tidy_get_config) + PHP_FE(tidy_get_status, arginfo_tidy_get_status) + PHP_FE(tidy_get_html_ver, arginfo_tidy_get_html_ver) + PHP_FE(tidy_is_xhtml, arginfo_tidy_is_xhtml) + PHP_FE(tidy_is_xml, arginfo_tidy_is_xml) + PHP_FE(tidy_error_count, arginfo_tidy_error_count) + PHP_FE(tidy_warning_count, arginfo_tidy_warning_count) + PHP_FE(tidy_access_count, arginfo_tidy_access_count) + PHP_FE(tidy_config_count, arginfo_tidy_config_count) #if HAVE_TIDYOPTGETDOC - PHP_FE(tidy_get_opt_doc, NULL) + PHP_FE(tidy_get_opt_doc, arginfo_tidy_get_opt_doc) #endif - PHP_FE(tidy_get_root, NULL) - PHP_FE(tidy_get_head, NULL) - PHP_FE(tidy_get_html, NULL) - PHP_FE(tidy_get_body, NULL) - PHP_FE(ob_tidyhandler, NULL) + PHP_FE(tidy_get_root, arginfo_tidy_get_root) + PHP_FE(tidy_get_head, arginfo_tidy_get_head) + PHP_FE(tidy_get_html, arginfo_tidy_get_html) + PHP_FE(tidy_get_body, arginfo_tidy_get_body) + PHP_FE(ob_tidyhandler, arginfo_ob_tidyhandler) {NULL, NULL, NULL} }; @@ -998,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.6 2008/03/10 22:12:36 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.7 2008/07/03 01:55:47 felipe Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.9&r2=1.1.2.38.2.10&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.9 php-src/ext/zip/php_zip.c:1.1.2.38.2.10 --- php-src/ext/zip/php_zip.c:1.1.2.38.2.9 Wed May 21 09:27:41 2008 +++ php-src/ext/zip/php_zip.c Thu Jul 3 01:55:48 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.38.2.9 2008/05/21 09:27:41 pajoye Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38.2.10 2008/07/03 01:55:48 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -607,18 +607,73 @@ #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() +/* }}} */ + /* {{{ zend_function_entry */ static zend_function_entry zip_functions[] = { - ZEND_RAW_FENTRY("zip_open", zif_zip_open, NULL, 0) - ZEND_RAW_FENTRY("zip_close", zif_zip_close, NULL, 0) - ZEND_RAW_FENTRY("zip_read", zif_zip_read, NULL, 0) - PHP_FE(zip_entry_open, NULL) - PHP_FE(zip_entry_close, NULL) - PHP_FE(zip_entry_read, NULL) - PHP_FE(zip_entry_filesize, NULL) - PHP_FE(zip_entry_name, NULL) - PHP_FE(zip_entry_compressedsize, NULL) - PHP_FE(zip_entry_compressionmethod, NULL) + ZEND_RAW_FENTRY("zip_open", zif_zip_open, arginfo_zip_open, 0) + ZEND_RAW_FENTRY("zip_close", zif_zip_close, arginfo_zip_close, 0) + ZEND_RAW_FENTRY("zip_read", zif_zip_read, arginfo_zip_read, 0) + PHP_FE(zip_entry_open, arginfo_zip_entry_open) + PHP_FE(zip_entry_close, arginfo_zip_entry_close) + PHP_FE(zip_entry_read, arginfo_zip_entry_read) + PHP_FE(zip_entry_filesize, arginfo_zip_entry_filesize) + PHP_FE(zip_entry_name, arginfo_zip_entry_name) + PHP_FE(zip_entry_compressedsize, arginfo_zip_entry_compressedsize) + PHP_FE(zip_entry_compressionmethod, arginfo_zip_entry_compressionmethod) {NULL, NULL, NULL} }; @@ -2551,7 +2606,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.9 2008/05/21 09:27:41 pajoye Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38.2.10 2008/07/03 01:55:48 felipe Exp $"); php_info_print_table_row(2, "Zip version", "@PACKAGE_VERSION@"); php_info_print_table_row(2, "Libzip version", "0.7.1"); http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.2&r2=1.183.2.6.2.5.2.3&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.2 php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.3 --- php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.2 Mon Dec 31 07:17:17 2007 +++ php-src/ext/zlib/zlib.c Thu Jul 3 01:55:48 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.183.2.6.2.5.2.2 2007/12/31 07:17:17 sebastian Exp $ */ +/* $Id: zlib.c,v 1.183.2.6.2.5.2.3 2008/07/03 01:55:48 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -101,10 +101,72 @@ static PHP_FUNCTION(ob_gzhandler); 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) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ php_zlib_functions[] */ static const zend_function_entry php_zlib_functions[] = { - PHP_FE(readgzfile, NULL) + PHP_FE(readgzfile, arginfo_readgzfile) PHP_FALIAS(gzrewind, rewind, NULL) PHP_FALIAS(gzclose, fclose, NULL) PHP_FALIAS(gzeof, feof, NULL) @@ -112,20 +174,20 @@ PHP_FALIAS(gzgets, fgets, NULL) PHP_FALIAS(gzgetss, fgetss, NULL) PHP_FALIAS(gzread, fread, NULL) - PHP_FE(gzopen, NULL) + PHP_FE(gzopen, arginfo_gzopen) PHP_FALIAS(gzpassthru, fpassthru, NULL) PHP_FALIAS(gzseek, fseek, NULL) PHP_FALIAS(gztell, ftell, NULL) PHP_FALIAS(gzwrite, fwrite, NULL) PHP_FALIAS(gzputs, fwrite, NULL) - PHP_FE(gzfile, NULL) - PHP_FE(gzcompress, NULL) - PHP_FE(gzuncompress, NULL) - PHP_FE(gzdeflate, NULL) - PHP_FE(gzinflate, NULL) - PHP_FE(gzencode, NULL) - PHP_FE(ob_gzhandler, NULL) - PHP_FE(zlib_get_coding_type, NULL) + PHP_FE(gzfile, arginfo_gzfile) + PHP_FE(gzcompress, arginfo_gzcompress) + PHP_FE(gzuncompress, arginfo_gzuncompress) + PHP_FE(gzdeflate, arginfo_gzdeflate) + PHP_FE(gzinflate, arginfo_gzinflate) + PHP_FE(gzencode, arginfo_gzencode) + PHP_FE(ob_gzhandler, arginfo_ob_gzhandler) + PHP_FE(zlib_get_coding_type, arginfo_zlib_get_coding_type) {NULL, NULL, NULL} }; /* }}} */