diff options
author | Arnaud Le Blanc <lbarnaud@php.net> | 2009-04-19 17:10:35 +0000 |
---|---|---|
committer | Arnaud Le Blanc <lbarnaud@php.net> | 2009-04-19 17:10:35 +0000 |
commit | 8ea9eb8560c02818a06369cdc33a2b2367964526 (patch) | |
tree | 03fd524b7e30fa1516596e2025bc7e29338c3211 /main/php_streams.h | |
parent | bd7f4375a3dabf883fe1f018a89d07a39ae36af5 (diff) | |
download | php-git-8ea9eb8560c02818a06369cdc33a2b2367964526.tar.gz |
MFH: Better fix for #47997
Diffstat (limited to 'main/php_streams.h')
-rwxr-xr-x | main/php_streams.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index fab62c19af..803c86793a 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -420,14 +420,12 @@ END_EXTERN_C() * Uses mmap if the src is a plain file and at offset 0 */ #define PHP_STREAM_COPY_ALL ((size_t)-1) -#define PHP_STREAM_FAILURE ((size_t)-1) - BEGIN_EXTERN_C() ZEND_ATTRIBUTE_DEPRECATED PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC); #define php_stream_copy_to_stream(src, dest, maxlen) _php_stream_copy_to_stream((src), (dest), (maxlen) STREAMS_CC TSRMLS_CC) -PHPAPI size_t _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC); -#define php_stream_copy_to_stream_ex(src, dest, maxlen) _php_stream_copy_to_stream_ex((src), (dest), (maxlen) STREAMS_CC TSRMLS_CC) +PHPAPI size_t _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size_t maxlen, size_t *len STREAMS_DC TSRMLS_DC); +#define php_stream_copy_to_stream_ex(src, dest, maxlen, len) _php_stream_copy_to_stream_ex((src), (dest), (maxlen), (len) STREAMS_CC TSRMLS_CC) /* read all data from stream and put into a buffer. Caller must free buffer when done. |