Skip to content

Commit ec22e5a

Browse files
committed
Get rid of empty function entries
Closes GH-5917
1 parent d92229d commit ec22e5a

File tree

10 files changed

+10
-71
lines changed

10 files changed

+10
-71
lines changed

ext/pdo_dblib/pdo_dblib.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
ZEND_DECLARE_MODULE_GLOBALS(dblib)
3232
static PHP_GINIT_FUNCTION(dblib);
3333

34-
static const zend_function_entry pdo_dblib_functions[] = {
35-
PHP_FE_END
36-
};
37-
3834
static const zend_module_dep pdo_dblib_deps[] = {
3935
ZEND_MOD_REQUIRED("pdo")
4036
ZEND_MOD_END
@@ -54,7 +50,7 @@ zend_module_entry pdo_dblib_module_entry = {
5450
#else
5551
"pdo_dblib",
5652
#endif
57-
pdo_dblib_functions,
53+
NULL,
5854
PHP_MINIT(pdo_dblib),
5955
PHP_MSHUTDOWN(pdo_dblib),
6056
NULL,

ext/pdo_firebird/pdo_firebird.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
#include "php_pdo_firebird.h"
2727
#include "php_pdo_firebird_int.h"
2828

29-
static const zend_function_entry pdo_firebird_functions[] = { /* {{{ */
30-
PHP_FE_END
31-
};
32-
/* }}} */
33-
3429
/* {{{ pdo_firebird_deps */
3530
static const zend_module_dep pdo_firebird_deps[] = {
3631
ZEND_MOD_REQUIRED("pdo")
@@ -42,7 +37,7 @@ zend_module_entry pdo_firebird_module_entry = { /* {{{ */
4237
STANDARD_MODULE_HEADER_EX, NULL,
4338
pdo_firebird_deps,
4439
"PDO_Firebird",
45-
pdo_firebird_functions,
40+
NULL,
4641
PHP_MINIT(pdo_firebird),
4742
PHP_MSHUTDOWN(pdo_firebird),
4843
NULL,

ext/pdo_mysql/pdo_mysql.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,6 @@ ZEND_TSRMLS_CACHE_UPDATE();
214214
}
215215
/* }}} */
216216

217-
/* {{{ pdo_mysql_functions[] */
218-
static const zend_function_entry pdo_mysql_functions[] = {
219-
PHP_FE_END
220-
};
221-
/* }}} */
222-
223217
/* {{{ pdo_mysql_deps[] */
224218
static const zend_module_dep pdo_mysql_deps[] = {
225219
ZEND_MOD_REQUIRED("pdo")
@@ -235,7 +229,7 @@ zend_module_entry pdo_mysql_module_entry = {
235229
STANDARD_MODULE_HEADER_EX, NULL,
236230
pdo_mysql_deps,
237231
"pdo_mysql",
238-
pdo_mysql_functions,
232+
NULL,
239233
PHP_MINIT(pdo_mysql),
240234
PHP_MSHUTDOWN(pdo_mysql),
241235
#if defined(PDO_USE_MYSQLND) && PDO_DBG_ENABLED

ext/pdo_oci/pdo_oci.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
#include <TSRM/TSRM.h>
3030
#endif
3131

32-
/* {{{ pdo_oci_functions[] */
33-
static const zend_function_entry pdo_oci_functions[] = {
34-
PHP_FE_END
35-
};
36-
/* }}} */
37-
3832
/* {{{ pdo_oci_module_entry */
3933

4034
static const zend_module_dep pdo_oci_deps[] = {
@@ -46,7 +40,7 @@ zend_module_entry pdo_oci_module_entry = {
4640
STANDARD_MODULE_HEADER_EX, NULL,
4741
pdo_oci_deps,
4842
"PDO_OCI",
49-
pdo_oci_functions,
43+
NULL,
5044
PHP_MINIT(pdo_oci),
5145
PHP_MSHUTDOWN(pdo_oci),
5246
PHP_RINIT(pdo_oci),

ext/pdo_odbc/pdo_odbc.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
#include "php_pdo_odbc.h"
2727
#include "php_pdo_odbc_int.h"
2828

29-
/* {{{ pdo_odbc_functions[] */
30-
static const zend_function_entry pdo_odbc_functions[] = {
31-
PHP_FE_END
32-
};
33-
/* }}} */
34-
3529
/* {{{ pdo_odbc_deps[] */
3630
static const zend_module_dep pdo_odbc_deps[] = {
3731
ZEND_MOD_REQUIRED("pdo")
@@ -44,7 +38,7 @@ zend_module_entry pdo_odbc_module_entry = {
4438
STANDARD_MODULE_HEADER_EX, NULL,
4539
pdo_odbc_deps,
4640
"PDO_ODBC",
47-
pdo_odbc_functions,
41+
NULL,
4842
PHP_MINIT(pdo_odbc),
4943
PHP_MSHUTDOWN(pdo_odbc),
5044
NULL,

ext/pdo_pgsql/pdo_pgsql.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
#include "php_pdo_pgsql.h"
2727
#include "php_pdo_pgsql_int.h"
2828

29-
/* {{{ pdo_pgsql_functions[] */
30-
static const zend_function_entry pdo_pgsql_functions[] = {
31-
PHP_FE_END
32-
};
33-
/* }}} */
34-
3529
/* {{{ pdo_sqlite_deps */
3630
static const zend_module_dep pdo_pgsql_deps[] = {
3731
ZEND_MOD_REQUIRED("pdo")
@@ -44,7 +38,7 @@ zend_module_entry pdo_pgsql_module_entry = {
4438
STANDARD_MODULE_HEADER_EX, NULL,
4539
pdo_pgsql_deps,
4640
"pdo_pgsql",
47-
pdo_pgsql_functions,
41+
NULL,
4842
PHP_MINIT(pdo_pgsql),
4943
PHP_MSHUTDOWN(pdo_pgsql),
5044
NULL,

ext/pdo_sqlite/pdo_sqlite.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
#include "php_pdo_sqlite_int.h"
2828
#include "zend_exceptions.h"
2929

30-
/* {{{ pdo_sqlite_functions[] */
31-
static const zend_function_entry pdo_sqlite_functions[] = {
32-
PHP_FE_END
33-
};
34-
/* }}} */
35-
3630
/* {{{ pdo_sqlite_deps */
3731
static const zend_module_dep pdo_sqlite_deps[] = {
3832
ZEND_MOD_REQUIRED("pdo")
@@ -45,7 +39,7 @@ zend_module_entry pdo_sqlite_module_entry = {
4539
STANDARD_MODULE_HEADER_EX, NULL,
4640
pdo_sqlite_deps,
4741
"pdo_sqlite",
48-
pdo_sqlite_functions,
42+
NULL,
4943
PHP_MINIT(pdo_sqlite),
5044
PHP_MSHUTDOWN(pdo_sqlite),
5145
NULL,

ext/phar/phar.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3207,15 +3207,6 @@ ZEND_TSRMLS_CACHE_DEFINE()
32073207
ZEND_GET_MODULE(phar)
32083208
#endif
32093209

3210-
/* {{{ phar_functions[]
3211-
*
3212-
* Every user visible function must have an entry in phar_functions[].
3213-
*/
3214-
static const zend_function_entry phar_functions[] = {
3215-
PHP_FE_END
3216-
};
3217-
/* }}}*/
3218-
32193210
static ssize_t phar_zend_stream_reader(void *handle, char *buf, size_t len) /* {{{ */
32203211
{
32213212
return php_stream_read(phar_get_pharfp((phar_archive_data*)handle), buf, len);
@@ -3574,7 +3565,7 @@ zend_module_entry phar_module_entry = {
35743565
STANDARD_MODULE_HEADER_EX, NULL,
35753566
phar_deps,
35763567
"Phar",
3577-
phar_functions,
3568+
NULL,
35783569
PHP_MINIT(phar),
35793570
PHP_MSHUTDOWN(phar),
35803571
NULL,

ext/reflection/php_reflection.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6381,10 +6381,6 @@ ZEND_METHOD(ReflectionAttribute, newInstance)
63816381

63826382
RETURN_COPY_VALUE(&obj);
63836383
}
6384-
/* }}} */
6385-
static const zend_function_entry reflection_ext_functions[] = { /* {{{ */
6386-
PHP_FE_END
6387-
}; /* }}} */
63886384

63896385
/* {{{ _reflection_write_property */
63906386
static zval *_reflection_write_property(zend_object *object, zend_string *name, zval *value, void **cache_slot)
@@ -6558,7 +6554,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
65586554
zend_module_entry reflection_module_entry = { /* {{{ */
65596555
STANDARD_MODULE_HEADER,
65606556
"Reflection",
6561-
reflection_ext_functions,
6557+
NULL,
65626558
PHP_MINIT(reflection),
65636559
NULL,
65646560
NULL,

ext/xsl/php_xsl.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@
2727
zend_class_entry *xsl_xsltprocessor_class_entry;
2828
static zend_object_handlers xsl_object_handlers;
2929

30-
/* {{{ xsl_functions[]
31-
*
32-
* Every user visible function must have an entry in xsl_functions[].
33-
*/
34-
const zend_function_entry xsl_functions[] = {
35-
PHP_FE_END
36-
};
37-
/* }}} */
38-
3930
static const zend_module_dep xsl_deps[] = {
4031
ZEND_MOD_REQUIRED("libxml")
4132
ZEND_MOD_END
@@ -46,7 +37,7 @@ zend_module_entry xsl_module_entry = {
4637
STANDARD_MODULE_HEADER_EX, NULL,
4738
xsl_deps,
4839
"xsl",
49-
xsl_functions,
40+
NULL,
5041
PHP_MINIT(xsl),
5142
PHP_MSHUTDOWN(xsl),
5243
NULL,

0 commit comments

Comments
 (0)