clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup unused module globals

Browse Source
This commit is contained in:
Dmitry Stogov 2019-03-12 13:44:05 +03:00
parent c48f5fe841
commit 5aa1176238
10 changed files with 1 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/enchant/php_enchant.h
View File

@ -61,10 +61,4 @@ PHP_FUNCTION(enchant_dict_get_error);
PHP_FUNCTION(enchant_dict_describe);
PHP_FUNCTION(enchant_dict_quick_check);
#ifdef ZTS
#define ENCHANT_G(v) TSRMG(enchant_globals_id, zend_enchant_globals *, v)
#else
#define ENCHANT_G(v) (enchant_globals.v)
#endif
#endif /* PHP_ENCHANT_H */

6
ext/fileinfo/php_fileinfo.h
View File

@ -43,10 +43,4 @@ PHP_FUNCTION(finfo_file);
PHP_FUNCTION(finfo_buffer);
PHP_FUNCTION(mime_content_type);
#ifdef ZTS
#define FILEINFO_G(v) TSRMG(fileinfo_globals_id, zend_fileinfo_globals *, v)
#else
#define FILEINFO_G(v) (fileinfo_globals.v)
#endif
#endif /* PHP_FILEINFO_H */

16
ext/pdo/pdo.c
View File

@ -37,9 +37,6 @@ zend_class_entry *pdo_dbh_ce, *pdo_dbstmt_ce, *pdo_row_ce;
/* for exceptional circumstances */
zend_class_entry *pdo_exception_ce;
ZEND_DECLARE_MODULE_GLOBALS(pdo)
static PHP_GINIT_FUNCTION(pdo);
/* True global resources - no need for thread safety here */
/* the registry of PDO drivers */
@ -132,11 +129,7 @@ zend_module_entry pdo_module_entry = {
NULL,
PHP_MINFO(pdo),
PHP_PDO_VERSION,
PHP_MODULE_GLOBALS(pdo),
PHP_GINIT(pdo),
NULL,
NULL,
STANDARD_MODULE_PROPERTIES_EX
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@ -147,13 +140,6 @@ zend_module_entry pdo_module_entry = {
ZEND_GET_MODULE(pdo)
#endif
/* {{{ PHP_GINIT_FUNCTION */
static PHP_GINIT_FUNCTION(pdo)
{
pdo_globals->global_value = 0;
}
/* }}} */
PDO_API int php_pdo_register_driver(const pdo_driver_t *driver) /* {{{ */
{
if (driver->api_version != PDO_DRIVER_API) {

10
ext/pdo/php_pdo.h
View File

@ -49,16 +49,6 @@ PHP_MINIT_FUNCTION(pdo);
PHP_MSHUTDOWN_FUNCTION(pdo);
PHP_MINFO_FUNCTION(pdo);
ZEND_BEGIN_MODULE_GLOBALS(pdo)
zend_long global_value;
ZEND_END_MODULE_GLOBALS(pdo)
#ifdef ZTS
# define PDOG(v) TSRMG(pdo_globals_id, zend_pdo_globals *, v)
#else
# define PDOG(v) (pdo_globals.v)
#endif
#define REGISTER_PDO_CLASS_CONST_LONG(const_name, value) \
zend_declare_class_constant_long(php_pdo_get_dbh_ce(), const_name, sizeof(const_name)-1, (zend_long)value);

16
ext/pdo_odbc/php_pdo_odbc.h
View File

@ -35,20 +35,4 @@ PHP_RINIT_FUNCTION(pdo_odbc);
PHP_RSHUTDOWN_FUNCTION(pdo_odbc);
PHP_MINFO_FUNCTION(pdo_odbc);
/*
Declare any global variables you may need between the BEGIN
and END macros here:
ZEND_BEGIN_MODULE_GLOBALS(pdo_odbc)
long global_value;
char *global_string;
ZEND_END_MODULE_GLOBALS(pdo_odbc)
*/
#ifdef ZTS
#define PDO_ODBC_G(v) TSRMG(pdo_odbc_globals_id, zend_pdo_odbc_globals *, v)
#else
#define PDO_ODBC_G(v) (pdo_odbc_globals.v)
#endif
#endif /* PHP_PDO_ODBC_H */

16
ext/pdo_sqlite/php_pdo_sqlite.h
View File

@ -35,20 +35,4 @@ PHP_RINIT_FUNCTION(pdo_sqlite);
PHP_RSHUTDOWN_FUNCTION(pdo_sqlite);
PHP_MINFO_FUNCTION(pdo_sqlite);
/*
Declare any global variables you may need between the BEGIN
and END macros here:
ZEND_BEGIN_MODULE_GLOBALS(pdo_sqlite)
long global_value;
char *global_string;
ZEND_END_MODULE_GLOBALS(pdo_sqlite)
*/
#ifdef ZTS
#define PDO_SQLITE_G(v) TSRMG(pdo_sqlite_globals_id, zend_pdo_sqlite_globals *, v)
#else
#define PDO_SQLITE_G(v) (pdo_sqlite_globals.v)
#endif
#endif /* PHP_PDO_SQLITE_H */

6
ext/simplexml/php_simplexml.h
View File

@ -69,12 +69,6 @@ typedef struct {
zend_object zo;
} php_sxe_object;
#ifdef ZTS
#define SIMPLEXML_G(v) TSRMG(simplexml_globals_id, zend_simplexml_globals *, v)
#else
#define SIMPLEXML_G(v) (simplexml_globals.v)
#endif
#ifdef PHP_WIN32
# ifdef PHP_SIMPLEXML_EXPORTS
# define PHP_SXE_API __declspec(dllexport)

6
ext/tokenizer/php_tokenizer.h
View File

@ -39,10 +39,4 @@ PHP_MINFO_FUNCTION(tokenizer);
PHP_FUNCTION(token_get_all);
PHP_FUNCTION(token_name);
#ifdef ZTS
#define TOKENIZER_G(v) TSRMG(tokenizer_globals_id, zend_tokenizer_globals *, v)
#else
#define TOKENIZER_G(v) (tokenizer_globals.v)
#endif
#endif /* PHP_TOKENIZER_H */

6
ext/xmlreader/php_xmlreader.h
View File

@ -62,10 +62,4 @@ PHP_MINFO_FUNCTION(xmlreader);
#define REGISTER_XMLREADER_CLASS_CONST_LONG(const_name, value) \
zend_declare_class_constant_long(xmlreader_class_entry, const_name, sizeof(const_name)-1, (zend_long)value);
#ifdef ZTS
#define XMLREADER_G(v) TSRMG(xmlreader_globals_id, zend_xmlreader_globals *, v)
#else
#define XMLREADER_G(v) (xmlreader_globals.v)
#endif
#endif /* PHP_XMLREADER_H */

17
ext/xsl/php_xsl.h
View File

@ -102,21 +102,4 @@ PHP_RINIT_FUNCTION(xsl);
PHP_RSHUTDOWN_FUNCTION(xsl);
PHP_MINFO_FUNCTION(xsl);
/*
Declare any global variables you may need between the BEGIN
and END macros here:
ZEND_BEGIN_MODULE_GLOBALS(xsl)
long global_value;
char *global_string;
ZEND_END_MODULE_GLOBALS(xsl)
*/
#ifdef ZTS
#define XSL_G(v) TSRMG(xsl_globals_id, zend_xsl_globals *, v)
#else
#define XSL_G(v) (xsl_globals.v)
#endif
#endif /* PHP_XSL_H */