diff options
| author | Wez Furlong <wez@php.net> | 2002-03-24 18:05:49 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-03-24 18:05:49 +0000 |
| commit | 5ee65bd8f5e6b3b205bc3eb08e019f2a15c07a35 (patch) | |
| tree | bd26669c2ff51733c3885aba15e1536dd1bc6d52 /ext/zlib | |
| parent | 68b18b05fe9c715b342867201f9130f0bb5cde9d (diff) | |
| download | php-git-5ee65bd8f5e6b3b205bc3eb08e019f2a15c07a35.tar.gz | |
Phase 1 of wrapper OO cleanup.
# Collecting underpants
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/php_zlib.h | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 6 | ||||
| -rw-r--r-- | ext/zlib/zlib_fopen_wrapper.c | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 8907838f55..803727c7da 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -53,7 +53,7 @@ PHP_FUNCTION(ob_gzhandler); int php_enable_output_compression(int buffer_size TSRMLS_DC); -php_stream *php_stream_gzopen(char *path, char *mode, int options, char **opened_path, void *wrappercontext STREAMS_DC TSRMLS_DC); +php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC); extern php_stream_ops php_stream_gzio_ops; extern php_stream_wrapper php_stream_gzip_wrapper; diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 823603a2db..24565602ea 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -273,7 +273,7 @@ PHP_FUNCTION(gzfile) convert_to_string_ex(filename); /* using a stream here is a bit more efficient (resource wise) than php_gzopen_wrapper */ - stream = php_stream_gzopen(Z_STRVAL_PP(filename), "rb", use_include_path|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC); + stream = php_stream_gzopen(NULL, Z_STRVAL_PP(filename), "rb", use_include_path|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL STREAMS_CC TSRMLS_CC); if (stream == NULL) { php_error(E_WARNING,"gzFile(\"%s\") - %s",Z_STRVAL_PP(filename),strerror(errno)); RETURN_FALSE; @@ -329,7 +329,7 @@ PHP_FUNCTION(gzopen) convert_to_string_ex(arg2); p = estrndup(Z_STRVAL_PP(arg2),Z_STRLEN_PP(arg2)); - stream = php_stream_gzopen(Z_STRVAL_PP(arg1), p, use_include_path|ENFORCE_SAFE_MODE, NULL, NULL STREAMS_CC TSRMLS_CC); + stream = php_stream_gzopen(NULL, Z_STRVAL_PP(arg1), p, use_include_path|ENFORCE_SAFE_MODE, NULL STREAMS_CC TSRMLS_CC); if (!stream) { RETURN_FALSE; } @@ -370,7 +370,7 @@ PHP_FUNCTION(readgzfile) } convert_to_string_ex(arg1); - stream = php_stream_gzopen(Z_STRVAL_PP(arg1), "rb", use_include_path|ENFORCE_SAFE_MODE, NULL, NULL STREAMS_CC TSRMLS_CC); + stream = php_stream_gzopen(NULL, Z_STRVAL_PP(arg1), "rb", use_include_path|ENFORCE_SAFE_MODE, NULL STREAMS_CC TSRMLS_CC); if (!stream) { RETURN_FALSE; } diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index 434719dae5..c6e60e3638 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -92,7 +92,7 @@ php_stream_ops php_stream_gzio_ops = { NULL, "ZLIB" }; -php_stream *php_stream_gzopen(char *path, char *mode, int options, char **opened_path, void *wrappercontext STREAMS_DC TSRMLS_DC) +php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC) { struct php_gz_stream_data_t *self; php_stream *stream = NULL; @@ -126,9 +126,13 @@ php_stream *php_stream_gzopen(char *path, char *mode, int options, char **opened return NULL; } -php_stream_wrapper php_stream_gzip_wrapper = { +static php_stream_wrapper_ops gzip_stream_wops = { php_stream_gzopen, - NULL, + NULL +}; + +php_stream_wrapper php_stream_gzip_wrapper = { + &gzip_stream_wops, NULL }; |