diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-04-16 14:30:25 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-04-16 14:30:25 +0000 |
| commit | 49b43ad115332a0a4139b112959f0564f80964b7 (patch) | |
| tree | 44c8d932ecae53b4c70c365318649dfe3c2b2768 /ext/standard/streamsfuncs.c | |
| parent | 8e165ea05042e99c246881a0e89192dc0691eab6 (diff) | |
| download | php-git-49b43ad115332a0a4139b112959f0564f80964b7.tar.gz | |
Changed stream filter factory to be capable of accepting a zval as a parameter
instead of a string
Diffstat (limited to 'ext/standard/streamsfuncs.c')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 2ad8ddd944..ee57d0da86 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -803,12 +803,13 @@ static void apply_filter_to_stream(int append, INTERNAL_FUNCTION_PARAMETERS) { zval *zstream; php_stream *stream; - char *filtername, *filterparams = NULL; - int filternamelen, filterparamslen = 0, read_write = 0; + char *filtername; + int filternamelen, read_write = 0; + zval *filterparams = NULL; php_stream_filter *filter; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|ls", &zstream, - &filtername, &filternamelen, &read_write, &filterparams, &filterparamslen) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|lz", &zstream, + &filtername, &filternamelen, &read_write, &filterparams) == FAILURE) { RETURN_FALSE; } @@ -829,7 +830,7 @@ static void apply_filter_to_stream(int append, INTERNAL_FUNCTION_PARAMETERS) } if (read_write & PHP_STREAM_FILTER_READ) { - filter = php_stream_filter_create(filtername, filterparams, filterparamslen, php_stream_is_persistent(stream) TSRMLS_CC); + filter = php_stream_filter_create(filtername, filterparams, php_stream_is_persistent(stream) TSRMLS_CC); if (filter == NULL) { RETURN_FALSE; } @@ -842,7 +843,7 @@ static void apply_filter_to_stream(int append, INTERNAL_FUNCTION_PARAMETERS) } if (read_write & PHP_STREAM_FILTER_WRITE) { - filter = php_stream_filter_create(filtername, filterparams, filterparamslen, php_stream_is_persistent(stream) TSRMLS_CC); + filter = php_stream_filter_create(filtername, filterparams, php_stream_is_persistent(stream) TSRMLS_CC); if (filter == NULL) { RETURN_FALSE; } |