Get rid of empty function entries

Closes GH-5917
This commit is contained in:
Máté Kocsis 2020-08-01 09:42:04 +02:00
parent d92229d8c7
commit ec22e5aa38
No known key found for this signature in database
GPG key ID: FD055E41728BF310
10 changed files with 10 additions and 71 deletions

View file

@ -31,10 +31,6 @@
ZEND_DECLARE_MODULE_GLOBALS(dblib) ZEND_DECLARE_MODULE_GLOBALS(dblib)
static PHP_GINIT_FUNCTION(dblib); static PHP_GINIT_FUNCTION(dblib);
static const zend_function_entry pdo_dblib_functions[] = {
PHP_FE_END
};
static const zend_module_dep pdo_dblib_deps[] = { static const zend_module_dep pdo_dblib_deps[] = {
ZEND_MOD_REQUIRED("pdo") ZEND_MOD_REQUIRED("pdo")
ZEND_MOD_END ZEND_MOD_END
@ -54,7 +50,7 @@ zend_module_entry pdo_dblib_module_entry = {
#else #else
"pdo_dblib", "pdo_dblib",
#endif #endif
pdo_dblib_functions, NULL,
PHP_MINIT(pdo_dblib), PHP_MINIT(pdo_dblib),
PHP_MSHUTDOWN(pdo_dblib), PHP_MSHUTDOWN(pdo_dblib),
NULL, NULL,

View file

@ -26,11 +26,6 @@
#include "php_pdo_firebird.h" #include "php_pdo_firebird.h"
#include "php_pdo_firebird_int.h" #include "php_pdo_firebird_int.h"
static const zend_function_entry pdo_firebird_functions[] = { /* {{{ */
PHP_FE_END
};
/* }}} */
/* {{{ pdo_firebird_deps */ /* {{{ pdo_firebird_deps */
static const zend_module_dep pdo_firebird_deps[] = { static const zend_module_dep pdo_firebird_deps[] = {
ZEND_MOD_REQUIRED("pdo") ZEND_MOD_REQUIRED("pdo")
@ -42,7 +37,7 @@ zend_module_entry pdo_firebird_module_entry = { /* {{{ */
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
pdo_firebird_deps, pdo_firebird_deps,
"PDO_Firebird", "PDO_Firebird",
pdo_firebird_functions, NULL,
PHP_MINIT(pdo_firebird), PHP_MINIT(pdo_firebird),
PHP_MSHUTDOWN(pdo_firebird), PHP_MSHUTDOWN(pdo_firebird),
NULL, NULL,

View file

@ -214,12 +214,6 @@ ZEND_TSRMLS_CACHE_UPDATE();
} }
/* }}} */ /* }}} */
/* {{{ pdo_mysql_functions[] */
static const zend_function_entry pdo_mysql_functions[] = {
PHP_FE_END
};
/* }}} */
/* {{{ pdo_mysql_deps[] */ /* {{{ pdo_mysql_deps[] */
static const zend_module_dep pdo_mysql_deps[] = { static const zend_module_dep pdo_mysql_deps[] = {
ZEND_MOD_REQUIRED("pdo") ZEND_MOD_REQUIRED("pdo")
@ -235,7 +229,7 @@ zend_module_entry pdo_mysql_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
pdo_mysql_deps, pdo_mysql_deps,
"pdo_mysql", "pdo_mysql",
pdo_mysql_functions, NULL,
PHP_MINIT(pdo_mysql), PHP_MINIT(pdo_mysql),
PHP_MSHUTDOWN(pdo_mysql), PHP_MSHUTDOWN(pdo_mysql),
#if defined(PDO_USE_MYSQLND) && PDO_DBG_ENABLED #if defined(PDO_USE_MYSQLND) && PDO_DBG_ENABLED

View file

@ -29,12 +29,6 @@
#include <TSRM/TSRM.h> #include <TSRM/TSRM.h>
#endif #endif
/* {{{ pdo_oci_functions[] */
static const zend_function_entry pdo_oci_functions[] = {
PHP_FE_END
};
/* }}} */
/* {{{ pdo_oci_module_entry */ /* {{{ pdo_oci_module_entry */
static const zend_module_dep pdo_oci_deps[] = { static const zend_module_dep pdo_oci_deps[] = {
@ -46,7 +40,7 @@ zend_module_entry pdo_oci_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
pdo_oci_deps, pdo_oci_deps,
"PDO_OCI", "PDO_OCI",
pdo_oci_functions, NULL,
PHP_MINIT(pdo_oci), PHP_MINIT(pdo_oci),
PHP_MSHUTDOWN(pdo_oci), PHP_MSHUTDOWN(pdo_oci),
PHP_RINIT(pdo_oci), PHP_RINIT(pdo_oci),

View file

@ -26,12 +26,6 @@
#include "php_pdo_odbc.h" #include "php_pdo_odbc.h"
#include "php_pdo_odbc_int.h" #include "php_pdo_odbc_int.h"
/* {{{ pdo_odbc_functions[] */
static const zend_function_entry pdo_odbc_functions[] = {
PHP_FE_END
};
/* }}} */
/* {{{ pdo_odbc_deps[] */ /* {{{ pdo_odbc_deps[] */
static const zend_module_dep pdo_odbc_deps[] = { static const zend_module_dep pdo_odbc_deps[] = {
ZEND_MOD_REQUIRED("pdo") ZEND_MOD_REQUIRED("pdo")
@ -44,7 +38,7 @@ zend_module_entry pdo_odbc_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
pdo_odbc_deps, pdo_odbc_deps,
"PDO_ODBC", "PDO_ODBC",
pdo_odbc_functions, NULL,
PHP_MINIT(pdo_odbc), PHP_MINIT(pdo_odbc),
PHP_MSHUTDOWN(pdo_odbc), PHP_MSHUTDOWN(pdo_odbc),
NULL, NULL,

View file

@ -26,12 +26,6 @@
#include "php_pdo_pgsql.h" #include "php_pdo_pgsql.h"
#include "php_pdo_pgsql_int.h" #include "php_pdo_pgsql_int.h"
/* {{{ pdo_pgsql_functions[] */
static const zend_function_entry pdo_pgsql_functions[] = {
PHP_FE_END
};
/* }}} */
/* {{{ pdo_sqlite_deps */ /* {{{ pdo_sqlite_deps */
static const zend_module_dep pdo_pgsql_deps[] = { static const zend_module_dep pdo_pgsql_deps[] = {
ZEND_MOD_REQUIRED("pdo") ZEND_MOD_REQUIRED("pdo")
@ -44,7 +38,7 @@ zend_module_entry pdo_pgsql_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
pdo_pgsql_deps, pdo_pgsql_deps,
"pdo_pgsql", "pdo_pgsql",
pdo_pgsql_functions, NULL,
PHP_MINIT(pdo_pgsql), PHP_MINIT(pdo_pgsql),
PHP_MSHUTDOWN(pdo_pgsql), PHP_MSHUTDOWN(pdo_pgsql),
NULL, NULL,

View file

@ -27,12 +27,6 @@
#include "php_pdo_sqlite_int.h" #include "php_pdo_sqlite_int.h"
#include "zend_exceptions.h" #include "zend_exceptions.h"
/* {{{ pdo_sqlite_functions[] */
static const zend_function_entry pdo_sqlite_functions[] = {
PHP_FE_END
};
/* }}} */
/* {{{ pdo_sqlite_deps */ /* {{{ pdo_sqlite_deps */
static const zend_module_dep pdo_sqlite_deps[] = { static const zend_module_dep pdo_sqlite_deps[] = {
ZEND_MOD_REQUIRED("pdo") ZEND_MOD_REQUIRED("pdo")
@ -45,7 +39,7 @@ zend_module_entry pdo_sqlite_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
pdo_sqlite_deps, pdo_sqlite_deps,
"pdo_sqlite", "pdo_sqlite",
pdo_sqlite_functions, NULL,
PHP_MINIT(pdo_sqlite), PHP_MINIT(pdo_sqlite),
PHP_MSHUTDOWN(pdo_sqlite), PHP_MSHUTDOWN(pdo_sqlite),
NULL, NULL,

View file

@ -3207,15 +3207,6 @@ ZEND_TSRMLS_CACHE_DEFINE()
ZEND_GET_MODULE(phar) ZEND_GET_MODULE(phar)
#endif #endif
/* {{{ phar_functions[]
*
* Every user visible function must have an entry in phar_functions[].
*/
static const zend_function_entry phar_functions[] = {
PHP_FE_END
};
/* }}}*/
static ssize_t phar_zend_stream_reader(void *handle, char *buf, size_t len) /* {{{ */ static ssize_t phar_zend_stream_reader(void *handle, char *buf, size_t len) /* {{{ */
{ {
return php_stream_read(phar_get_pharfp((phar_archive_data*)handle), buf, len); return php_stream_read(phar_get_pharfp((phar_archive_data*)handle), buf, len);
@ -3574,7 +3565,7 @@ zend_module_entry phar_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
phar_deps, phar_deps,
"Phar", "Phar",
phar_functions, NULL,
PHP_MINIT(phar), PHP_MINIT(phar),
PHP_MSHUTDOWN(phar), PHP_MSHUTDOWN(phar),
NULL, NULL,

View file

@ -6381,10 +6381,6 @@ ZEND_METHOD(ReflectionAttribute, newInstance)
RETURN_COPY_VALUE(&obj); RETURN_COPY_VALUE(&obj);
} }
/* }}} */
static const zend_function_entry reflection_ext_functions[] = { /* {{{ */
PHP_FE_END
}; /* }}} */
/* {{{ _reflection_write_property */ /* {{{ _reflection_write_property */
static zval *_reflection_write_property(zend_object *object, zend_string *name, zval *value, void **cache_slot) static zval *_reflection_write_property(zend_object *object, zend_string *name, zval *value, void **cache_slot)
@ -6558,7 +6554,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
zend_module_entry reflection_module_entry = { /* {{{ */ zend_module_entry reflection_module_entry = { /* {{{ */
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"Reflection", "Reflection",
reflection_ext_functions, NULL,
PHP_MINIT(reflection), PHP_MINIT(reflection),
NULL, NULL,
NULL, NULL,

View file

@ -27,15 +27,6 @@
zend_class_entry *xsl_xsltprocessor_class_entry; zend_class_entry *xsl_xsltprocessor_class_entry;
static zend_object_handlers xsl_object_handlers; static zend_object_handlers xsl_object_handlers;
/* {{{ xsl_functions[]
*
* Every user visible function must have an entry in xsl_functions[].
*/
const zend_function_entry xsl_functions[] = {
PHP_FE_END
};
/* }}} */
static const zend_module_dep xsl_deps[] = { static const zend_module_dep xsl_deps[] = {
ZEND_MOD_REQUIRED("libxml") ZEND_MOD_REQUIRED("libxml")
ZEND_MOD_END ZEND_MOD_END
@ -46,7 +37,7 @@ zend_module_entry xsl_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
xsl_deps, xsl_deps,
"xsl", "xsl",
xsl_functions, NULL,
PHP_MINIT(xsl), PHP_MINIT(xsl),
PHP_MSHUTDOWN(xsl), PHP_MSHUTDOWN(xsl),
NULL, NULL,