CVS update: php4/ext/session

Date: Friday June 11, 1999 @ 5:23 Author: zeev Update of /repository/php4/ext/session In directory php:/tmp/cvs-serv11236/ext/session Modified Files: mod_files.c php_session.h session.c Log Message: * Fix a buglet in the session module * Make some renames in the session module - avoid having a function called 'delete' so that we don't piss any C++ compilers. Also rename the {startup,shutdown}_globals to {startup,shutdown}_session_globals, so that they're a bit less general names, and made them static. * Remove uselss variables Index: php4/ext/session/mod_files.c diff -u php4/ext/session/mod_files.c:1.4 php4/ext/session/mod_files.c:1.5 --- php4/ext/session/mod_files.c:1.4 Mon Jun 7 15:51:52 1999 +++ php4/ext/session/mod_files.c Fri Jun 11 05:23:00 1999 @@ -165,7 +165,7 @@ return SUCCESS; } -PS_DELETE_FUNC(files) +PS_DESTROY_FUNC(files) { char buf[MAXPATHLEN]; PS_FILES_DATA; Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.3 php4/ext/session/php_session.h:1.4 --- php4/ext/session/php_session.h:1.3 Mon Jun 7 12:43:24 1999 +++ php4/ext/session/php_session.h Fri Jun 11 05:23:00 1999 @@ -39,7 +39,7 @@ #define PS_CLOSE_ARGS void **mod_data #define PS_READ_ARGS void **mod_data, const char *key, char **val, int *vallen #define PS_WRITE_ARGS void **mod_data, const char *key, const char *val, const int vallen -#define PS_DELETE_ARGS void **mod_data, const char *key +#define PS_DESTROY_ARGS void **mod_data, const char *key #define PS_GC_ARGS void **mod_data, int maxlifetime typedef struct ps_module_struct { @@ -48,7 +48,7 @@ int (*close)(PS_CLOSE_ARGS); int (*read)(PS_READ_ARGS); int (*write)(PS_WRITE_ARGS); - int (*delete)(PS_DELETE_ARGS); + int (*destroy)(PS_DESTROY_ARGS); int (*gc)(PS_GC_ARGS); } ps_module; @@ -57,7 +57,7 @@ #define PS_CLOSE_FUNC(x) int _ps_close_##x(PS_CLOSE_ARGS) #define PS_READ_FUNC(x) int _ps_read_##x(PS_READ_ARGS) #define PS_WRITE_FUNC(x) int _ps_write_##x(PS_WRITE_ARGS) -#define PS_DELETE_FUNC(x) int _ps_delete_##x(PS_DELETE_ARGS) +#define PS_DESTROY_FUNC(x) int _ps_delete_##x(PS_DESTROY_ARGS) #define PS_GC_FUNC(x) int _ps_gc_##x(PS_GC_ARGS) #define PS_FUNCS(x) \ @@ -65,7 +65,7 @@ PS_CLOSE_FUNC(x); \ PS_READ_FUNC(x); \ PS_WRITE_FUNC(x); \ - PS_DELETE_FUNC(x); \ + PS_DESTROY_FUNC(x); \ PS_GC_FUNC(x) Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.16 php4/ext/session/session.c:1.17 --- php4/ext/session/session.c:1.16 Mon Jun 7 15:51:54 1999 +++ php4/ext/session/session.c Fri Jun 11 05:23:00 1999 @@ -86,7 +86,7 @@ static int php_mshutdown_session(SHUTDOWN_FUNC_ARGS); static int php_rshutdown_session(SHUTDOWN_FUNC_ARGS); static void php_info_isapi(ZEND_MODULE_INFO_FUNC_ARGS); -static void php_rshutdown_globals(PSLS_D); +static void php_rshutdown_session_globals(PSLS_D); zend_module_entry session_module_entry = { "session", @@ -308,7 +308,7 @@ if(PS(mod_data) && PS(gc_probability) > 0) { srand(time(NULL)); - nrand = (100.0*rand()/RAND_MAX); + nrand = (int) (100.0*rand()/RAND_MAX); if(nrand >= PS(gc_probability)) PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime)); } @@ -319,8 +319,8 @@ if(PS(nr_open_sessions) == 0) return; - PS(mod)->delete(&PS(mod_data), &PS(id)); - php_rshutdown_globals(PSLS_C); + PS(mod)->destroy(&PS(mod_data), PS(id)); + php_rshutdown_session_globals(PSLS_C); PS(nr_open_sessions)--; } @@ -521,7 +521,7 @@ } /* }}} */ -void php_rinit_globals(PSLS_D) +static void php_rinit_session_globals(PSLS_D) { PS(mod) = _php_find_ps_module(INI_STR("session_module_name") PSLS_CC); @@ -535,7 +535,7 @@ PS(mod_data) = NULL; } -void php_rshutdown_globals(PSLS_D) +static void php_rshutdown_session_globals(PSLS_D) { if(PS(mod_data)) PS(mod)->close(&PS(mod_data)); @@ -549,7 +549,7 @@ { PSLS_FETCH(); - php_rinit_globals(PSLS_C); + php_rinit_session_globals(PSLS_C); if(INI_INT("session_auto_start")) { _php_session_start(PSLS_C); @@ -568,7 +568,7 @@ _php_session_save_current_state(PSLS_C); PS(nr_open_sessions)--; } - php_rshutdown_globals(PSLS_C); + php_rshutdown_session_globals(PSLS_C); return SUCCESS; }