From 1dbaae2795b756a3875c53da00b277f241cc04b8 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 15 Jun 2006 18:33:09 +0000 Subject: Added automatic module globals management --- ext/fbsql/php_fbsql.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'ext/fbsql/php_fbsql.c') diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c index 3174defd9d..e78d14bffe 100644 --- a/ext/fbsql/php_fbsql.c +++ b/ext/fbsql/php_fbsql.c @@ -165,6 +165,9 @@ struct PHPFBLink #define DIGEST_BUFFER_SIZE 17 /* fbcDigestPassword() expects a preallocated buffer for 16 bytes plus termination */ +ZEND_DECLARE_MODULE_GLOBALS(fbsql) +static PHP_GINIT_FUNCTION(fbsql); + int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql); char *DigestPassword(char *user, char *password) { @@ -620,11 +623,13 @@ zend_module_entry fbsql_module_entry = { PHP_RSHUTDOWN(fbsql), PHP_MINFO(fbsql), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(fbsql), + PHP_GINIT(fbsql), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; -ZEND_DECLARE_MODULE_GLOBALS(fbsql) - #ifdef COMPILE_DL_FBSQL ZEND_GET_MODULE(fbsql) #endif @@ -745,7 +750,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -static void php_fbsql_init_globals(zend_fbsql_globals *fbsql_globals) +static PHP_GINIT_FUNCTION(fbsql) { fbsql_globals->persistentCount = 0; @@ -763,8 +768,6 @@ static void php_fbsql_init_globals(zend_fbsql_globals *fbsql_globals) PHP_MINIT_FUNCTION(fbsql) { - ZEND_INIT_MODULE_GLOBALS(fbsql, php_fbsql_init_globals, NULL); - REGISTER_INI_ENTRIES(); fbcInitialize(); -- cgit v1.2.1