diff options
author | Anatol Belski <ab@php.net> | 2014-10-15 09:37:55 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-10-15 09:37:55 +0200 |
commit | c00424e427930a33e6d8645cc3f23fb78ed29b9f (patch) | |
tree | 83190e6ac9d0714fc971fe0925a0d935414de91c /main/streams/cast.c | |
parent | 382f95e6127d52b079d172ccd017cf306402e015 (diff) | |
download | php-git-c00424e427930a33e6d8645cc3f23fb78ed29b9f.tar.gz |
bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
Diffstat (limited to 'main/streams/cast.c')
-rw-r--r-- | main/streams/cast.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/main/streams/cast.c b/main/streams/cast.c index dcb036aa4b..3291a9ca8f 100644 --- a/main/streams/cast.c +++ b/main/streams/cast.c @@ -63,6 +63,7 @@ FILE *fopencookie(void *cookie, const char *mode, COOKIE_IO_FUNCTIONS_T *funcs) static int stream_cookie_reader(void *cookie, char *buffer, int size) { int ret; + TSRMLS_FETCH(); ret = php_stream_read((php_stream*)cookie, buffer, size); return ret; @@ -70,17 +71,22 @@ static int stream_cookie_reader(void *cookie, char *buffer, int size) static int stream_cookie_writer(void *cookie, const char *buffer, int size) { + TSRMLS_FETCH(); + return php_stream_write((php_stream *)cookie, (char *)buffer, size); } static PHP_FPOS_T stream_cookie_seeker(void *cookie, zend_off_t position, int whence) { + TSRMLS_FETCH(); + return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, position, whence); } static int stream_cookie_closer(void *cookie) { php_stream *stream = (php_stream*)cookie; + TSRMLS_FETCH(); /* prevent recursion */ stream->fclose_stdiocast = PHP_STREAM_FCLOSE_NONE; @@ -90,6 +96,7 @@ static int stream_cookie_closer(void *cookie) static ssize_t stream_cookie_reader(void *cookie, char *buffer, size_t size) { ssize_t ret; + TSRMLS_FETCH(); ret = php_stream_read(((php_stream *)cookie), buffer, size); return ret; @@ -97,12 +104,16 @@ static ssize_t stream_cookie_reader(void *cookie, char *buffer, size_t size) static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t size) { + TSRMLS_FETCH(); + return php_stream_write(((php_stream *)cookie), (char *)buffer, size); } # ifdef COOKIE_SEEKER_USES_OFF64_T static int stream_cookie_seeker(void *cookie, __off64_t *position, int whence) { + TSRMLS_FETCH(); + *position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence); if (*position == -1) { @@ -113,6 +124,8 @@ static int stream_cookie_seeker(void *cookie, __off64_t *position, int whence) # else static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence) { + TSRMLS_FETCH(); + return php_stream_seek((php_stream *)cookie, position, whence); } # endif @@ -120,6 +133,7 @@ static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence) static int stream_cookie_closer(void *cookie) { php_stream *stream = (php_stream*)cookie; + TSRMLS_FETCH(); /* prevent recursion */ stream->fclose_stdiocast = PHP_STREAM_FCLOSE_NONE; |