diff options
| -rw-r--r-- | main/memory_streams.c | 6 | ||||
| -rw-r--r-- | main/php_memory_streams.h | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/main/memory_streams.c b/main/memory_streams.c index f70f3ebedc..d3dda056e9 100644 --- a/main/memory_streams.c +++ b/main/memory_streams.c @@ -232,7 +232,7 @@ PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length ST php_stream *stream; php_stream_memory_data *ms; - if ((stream = _php_stream_memory_create(TEMP_STREAM_DEFAULT STREAMS_REL_CC)) != NULL) { + if ((stream = php_stream_memory_create_rel(TEMP_STREAM_DEFAULT)) != NULL) { if (length) { assert(buf != NULL); php_stream_write(stream, buf, length); @@ -273,7 +273,7 @@ static size_t php_stream_temp_write(php_stream *stream, const char *buf, size_t if (php_stream_is(ts->innerstream, PHP_STREAM_IS_MEMORY)) { size_t memsize; - char *membuf = _php_stream_memory_get_buffer(ts->innerstream, &memsize STREAMS_CC); + char *membuf = php_stream_memory_get_buffer(ts->innerstream, &memsize); if (memsize + count >= ts->smax) { php_stream *file = php_stream_fopen_tmpfile(); @@ -375,7 +375,7 @@ PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char php_stream *stream; php_stream_temp_data *ms; - if ((stream = _php_stream_temp_create(mode & ~TEMP_STREAM_READONLY, max_memory_usage STREAMS_REL_CC)) != NULL) { + if ((stream = php_stream_temp_create_rel(mode & ~TEMP_STREAM_READONLY, max_memory_usage)) != NULL) { if (length) { assert(buf != NULL); php_stream_temp_write(stream, buf, length); diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h index 35ca81b543..64c7c7249d 100644 --- a/main/php_memory_streams.h +++ b/main/php_memory_streams.h @@ -21,12 +21,14 @@ #include "php_streams.h" -#define php_stream_memory_create(mode) _php_stream_memory_create((mode) STREAMS_REL_CC); -#define php_stream_memory_open(mode, buf, length) _php_stream_memory_open((mode), (buf), (length) STREAMS_REL_CC); -#define php_stream_memory_get_buffer(stream, length) _php_stream_memory_get_buffer((stream), (length) STREAMS_REL_CC); - -#define php_stream_temp_create(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_REL_CC); -#define php_stream_temp_open(mode, max_memory_usage, buf, length) _php_stream_temp_open((mode), (max_memory_usage), (buf), (length) STREAMS_REL_CC); +#define php_stream_memory_create(mode) _php_stream_memory_create((mode) STREAMS_CC) +#define php_stream_memory_create_rel(mode) _php_stream_memory_create((mode) STREAMS_REL_CC) +#define php_stream_memory_open(mode, buf, length) _php_stream_memory_open((mode), (buf), (length) STREAMS_CC) +#define php_stream_memory_get_buffer(stream, length) _php_stream_memory_get_buffer((stream), (length) STREAMS_CC) + +#define php_stream_temp_create(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_CC) +#define php_stream_temp_create_rel(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_REL_CC) +#define php_stream_temp_open(mode, max_memory_usage, buf, length) _php_stream_temp_open((mode), (max_memory_usage), (buf), (length) STREAMS_CC) PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC); |