From: Felipe Pena Date: Fri, 24 Oct 2008 16:02:16 +0000 (+0000) Subject: - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro X-Git-Tag: BEFORE_HEAD_NS_CHANGE~168 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=916b56d2d9cbec250f3dd3bc558933047982871e;p=php - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro --- diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 62eb172bce..5718f1c72a 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -241,7 +241,6 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS) PHP_FUNCTION(getallheaders); /* {{{ arginfo */ -static ZEND_BEGIN_ARG_INFO(arginfo_aolserver_getallheaders, 0) ZEND_END_ARG_INFO() /* }}} */ diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 78ab895f9d..0c35a84d09 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -56,50 +56,40 @@ PHP_FUNCTION(apache_reset_timeout); 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() diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c index 290e575f24..d15935d679 100644 --- a/sapi/apache2filter/php_functions.c +++ b/sapi/apache2filter/php_functions.c @@ -360,48 +360,39 @@ PHP_MINFO_FUNCTION(apache) } /* {{{ 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() /* }}} */ diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 042a181cc6..d1719afd38 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -469,48 +469,39 @@ PHP_MINFO_FUNCTION(apache) } /* {{{ 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() /* }}} */ diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index 2e43bf3058..c554a75b72 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -59,48 +59,38 @@ PHP_FUNCTION(apache_get_modules); 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) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 2af280984b..76b8a53abf 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -848,7 +848,6 @@ static sapi_module_struct cgi_sapi_module = { /* }}} */ /* {{{ arginfo ext/standard/dl.c */ -static ZEND_BEGIN_ARG_INFO(arginfo_dl, 0) ZEND_ARG_INFO(0, extension_filename) ZEND_END_ARG_INFO() diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index a825fa16bb..5c0df125f1 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -434,7 +434,6 @@ static sapi_module_struct cli_sapi_module = { }; /* }}} */ /* {{{ arginfo ext/standard/dl.c */ -static ZEND_BEGIN_ARG_INFO(arginfo_dl, 0) ZEND_ARG_INFO(0, extension_filename) ZEND_END_ARG_INFO() diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 5c3bf1197c..1a86113cc7 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -141,7 +141,6 @@ sapi_module_struct php_embed_module = { }; /* }}} */ /* {{{ arginfo ext/standard/dl.c */ -static ZEND_BEGIN_ARG_INFO(arginfo_dl, 0) ZEND_ARG_INFO(0, extension_filename) ZEND_END_ARG_INFO() diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index 1741799f1e..b4c4be5d81 100644 --- a/sapi/milter/php_milter.c +++ b/sapi/milter/php_milter.c @@ -770,51 +770,42 @@ PHP_MINFO_FUNCTION(milter) /* }}} */ /* {{{ 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() diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c index 7cb1781d97..e1d76d3ac6 100644 --- a/sapi/nsapi/nsapi.c +++ b/sapi/nsapi/nsapi.c @@ -170,16 +170,13 @@ ZEND_DECLARE_MODULE_GLOBALS(nsapi) /* {{{ 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() /* }}} */