diff options
author | Zeev Suraski <zeev@php.net> | 1999-04-08 21:14:50 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 1999-04-08 21:14:50 +0000 |
commit | 9d8e0db38f3e489bec8e2f50b223800964f9e089 (patch) | |
tree | 58e43a0c83f4f8dbe0e9357e4c5f833a97a455bf | |
parent | f2d5ca74829a59fea3755f42ec5b4ab0d0a6b453 (diff) | |
download | php-git-9d8e0db38f3e489bec8e2f50b223800964f9e089.tar.gz |
* Add arguments to shutdown functions
* Remove traces of php_ini stuff
-rw-r--r-- | Zend/zend_API.c | 6 | ||||
-rw-r--r-- | Zend/zend_modules.h | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 6ab3072457..3dfea5f121 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -617,14 +617,14 @@ void module_destructor(zend_module_entry *module) #if 0 zend_printf("%s: Request shutdown\n",module->name); #endif - module->request_shutdown_func(); + module->request_shutdown_func(module->type, module->module_number); } module->request_started=0; if (module->module_started && module->module_shutdown_func) { #if 0 zend_printf("%s: Module shutdown\n",module->name); #endif - module->module_shutdown_func(); + module->module_shutdown_func(module->type, module->module_number); } module->module_started=0; unregister_functions(module->functions,-1); @@ -662,7 +662,7 @@ int module_registry_cleanup(zend_module_entry *module) #if 0 zend_printf("%s: Request shutdown\n",module->name); #endif - module->request_shutdown_func(); + module->request_shutdown_func(module->type, module->module_number); } module->request_started=0; return 0; diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h index 2aafdd3b0d..ee0b879c54 100644 --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@ -17,13 +17,10 @@ #ifndef _MODULES_H #define _MODULES_H -#define INIT_FUNC_ARGS int type, int module_number +#define INIT_FUNC_ARGS int type, int module_number +#define SHUTDOWN_FUNC_ARGS int type, int module_number -#ifdef HAS_ZEND_INI_ENTRIES #define STANDARD_MODULE_PROPERTIES 0, 0, 0, NULL, 0 -#else -#define STANDARD_MODULE_PROPERTIES 0, 0, 0, NULL, 0 -#endif #define MODULE_PERSISTENT 1 @@ -33,9 +30,9 @@ typedef struct { char *name; function_entry *functions; int (*module_startup_func)(INIT_FUNC_ARGS); - int (*module_shutdown_func)(void); + int (*module_shutdown_func)(SHUTDOWN_FUNC_ARGS); int (*request_startup_func)(INIT_FUNC_ARGS); - int (*request_shutdown_func)(void); + int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS); void (*info_func)(void); int request_started,module_started; unsigned char type; |