diff options
| author | Sascha Schumann <sas@php.net> | 2002-03-06 09:02:31 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2002-03-06 09:02:31 +0000 |
| commit | ca59cb7cf90b10161b96b8d34d88fd8244e15272 (patch) | |
| tree | 2463485fc7bc5ebbd67d4128262497ab6799eb83 /ext/session/mod_user.c | |
| parent | d36ddb5a9ff286d4140c56b095090a784d43016f (diff) | |
| download | php-git-ca59cb7cf90b10161b96b8d34d88fd8244e15272.tar.gz | |
Weep out all recent commits of Yasuo.
I don't have time right now to leave in the good ones and remove
only the bad ones.
There are some semantical changes which I reject, because
they aim at fixing a bug which is at a completely other location.
Then SID does not gefined anymore properly. (This broken patch
has not been sent to me at all.)
Also, there were *so* many whitespace changes which already
make these commits bogus.
Diffstat (limited to 'ext/session/mod_user.c')
| -rw-r--r-- | ext/session/mod_user.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index 970f1ef7c0..3f36cb206b 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -51,10 +51,11 @@ ps_module ps_mod_user = { } -static zval *ps_call_handler(zval *func, int argc, zval **argv TSRMLS_DC) +static zval *ps_call_handler(zval *func, int argc, zval **argv) { int i; zval *retval = NULL; + TSRMLS_FETCH(); MAKE_STD_ZVAL(retval); if (call_user_function(EG(function_table), NULL, func, retval, @@ -95,7 +96,7 @@ PS_OPEN_FUNC(user) SESS_ZVAL_STRING(save_path, args[0]); SESS_ZVAL_STRING(session_name, args[1]); - retval = ps_call_handler(PSF(open), 2, args TSRMLS_CC); + retval = ps_call_handler(PSF(open), 2, args); FINISH; } @@ -105,7 +106,7 @@ PS_CLOSE_FUNC(user) int i; STDVARS; - retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC); + retval = ps_call_handler(PSF(close), 0, NULL); for (i = 0; i < 6; i++) zval_ptr_dtor(&mdata->names[i]); @@ -123,7 +124,7 @@ PS_READ_FUNC(user) SESS_ZVAL_STRING(key, args[0]); - retval = ps_call_handler(PSF(read), 1, args TSRMLS_CC); + retval = ps_call_handler(PSF(read), 1, args); if (retval) { if (Z_TYPE_P(retval) == IS_STRING) { @@ -145,7 +146,7 @@ PS_WRITE_FUNC(user) SESS_ZVAL_STRING(key, args[0]); SESS_ZVAL_STRINGN(val, vallen, args[1]); - retval = ps_call_handler(PSF(write), 2, args TSRMLS_CC); + retval = ps_call_handler(PSF(write), 2, args); FINISH; } @@ -157,7 +158,7 @@ PS_DESTROY_FUNC(user) SESS_ZVAL_STRING(key, args[0]); - retval = ps_call_handler(PSF(destroy), 1, args TSRMLS_CC); + retval = ps_call_handler(PSF(destroy), 1, args); FINISH; } @@ -169,7 +170,7 @@ PS_GC_FUNC(user) SESS_ZVAL_LONG(maxlifetime, args[0]); - retval = ps_call_handler(PSF(gc), 1, args TSRMLS_CC); + retval = ps_call_handler(PSF(gc), 1, args); FINISH; } |