diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2002-03-06 00:05:21 +0000 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2002-03-06 00:05:21 +0000 |
| commit | 40423348822fb6d6b5569d7ef2f8699ee0d02287 (patch) | |
| tree | 9cb75f139e6c7a054a630a606d94b6bf4e5d2f7a /ext/session/mod_files.c | |
| parent | 1a209b0875f320e511b1166b4f2baf6f1e16c9fb (diff) | |
| download | php-git-40423348822fb6d6b5569d7ef2f8699ee0d02287.tar.gz | |
Remove TSRMLS_FETCH() and use TSRMLS_C/TSRMLS_D
# Need a little more work for backword compatibility
Diffstat (limited to 'ext/session/mod_files.c')
| -rw-r--r-- | ext/session/mod_files.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 322d3cc3cf..9ca57b7eac 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -123,10 +123,9 @@ static void ps_files_close(ps_files *data) } } -static void ps_files_open(ps_files *data, const char *key) +static void ps_files_open(ps_files *data, const char *key TSRMLS_DC) { char buf[MAXPATHLEN]; - TSRMLS_FETCH(); if (data->fd < 0 || !data->lastkey || strcmp(key, data->lastkey)) { if (data->lastkey) { @@ -159,7 +158,7 @@ static void ps_files_open(ps_files *data, const char *key) } } -static int ps_files_cleanup_dir(const char *dirname, int maxlifetime) +static int ps_files_cleanup_dir(const char *dirname, int maxlifetime TSRMLS_DC) { DIR *dir; char dentry[sizeof(struct dirent) + MAXPATHLEN]; @@ -169,7 +168,6 @@ static int ps_files_cleanup_dir(const char *dirname, int maxlifetime) time_t now; int nrdels = 0; size_t dirname_len; - TSRMLS_FETCH(); dir = opendir(dirname); if (!dir) { @@ -254,7 +252,7 @@ PS_READ_FUNC(files) struct stat sbuf; PS_FILES_DATA; - ps_files_open(data, key); + ps_files_open(data, key TSRMLS_CC); if (data->fd < 0) return FAILURE; @@ -283,7 +281,7 @@ PS_WRITE_FUNC(files) long n; PS_FILES_DATA; - ps_files_open(data, key); + ps_files_open(data, key TSRMLS_CC); if (data->fd < 0) return FAILURE; @@ -314,7 +312,6 @@ PS_DESTROY_FUNC(files) { char buf[MAXPATHLEN]; PS_FILES_DATA; - TSRMLS_FETCH(); if (!ps_files_path_create(buf, sizeof(buf), data, key)) return FAILURE; @@ -337,7 +334,7 @@ PS_GC_FUNC(files) an external entity (i.e. find -ctime x | xargs rm) */ if (data->dirdepth == 0) - *nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime); + *nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime TSRMLS_CC); return SUCCESS; } |