Permalink
Browse files

* Add arguments to shutdown functions

* Remove traces of php_ini stuff
  • Loading branch information...
1 parent f2d5ca7 commit 9d8e0db38f3e489bec8e2f50b223800964f9e089 @zsuraski zsuraski committed Apr 8, 1999
Showing with 7 additions and 10 deletions.
  1. +3 −3 Zend/zend_API.c
  2. +4 −7 Zend/zend_modules.h
View
@@ -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;
View
@@ -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;

0 comments on commit 9d8e0db

Please sign in to comment.