cvs: php4 /main memory_streams.c php_memory_streams.h

wez Mon Mar 18 06:18:08 2002 EDT Modified files: /php4/main memory_streams.c php_memory_streams.h Log: tidyup use of STREAMS_DC macros Index: php4/main/memory_streams.c diff -u php4/main/memory_streams.c:1.3 php4/main/memory_streams.c:1.4 --- php4/main/memory_streams.c:1.3 Sun Mar 17 23:57:06 2002 +++ php4/main/memory_streams.c Mon Mar 18 06:18:07 2002 @@ -232,7 +232,7 @@ 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 @@ 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 @@ 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); Index: php4/main/php_memory_streams.h diff -u php4/main/php_memory_streams.h:1.3 php4/main/php_memory_streams.h:1.4 --- php4/main/php_memory_streams.h:1.3 Sun Mar 17 23:57:06 2002 +++ php4/main/php_memory_streams.h Mon Mar 18 06:18:07 2002 @@ -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_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_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_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);