From df777055725e844b983dc6e550e7d43c1c0b726b Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Wed, 15 Mar 2006 00:28:57 +0000 Subject: [PATCH] Switch (zstr) casts to use ZSTR() macro. --- ext/standard/file.c | 2 +- main/streams/streams.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/standard/file.c b/ext/standard/file.c index 032ff77bf3..9457aba379 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -749,7 +749,7 @@ PHP_FUNCTION(file) s = target_buf; e = target_buf + target_len; - if (!(p = php_stream_locate_eol(stream, (zstr)target_buf, target_len TSRMLS_CC))) { + if (!(p = php_stream_locate_eol(stream, ZSTR(target_buf), target_len TSRMLS_CC))) { p = e; goto parse_eol; } diff --git a/main/streams/streams.c b/main/streams/streams.c index 8157ca5188..3a2ddf693c 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1335,7 +1335,7 @@ PHPAPI int _php_stream_flush(php_stream *stream, int closing TSRMLS_DC) int ret = 0; if (stream->writefilters.head) { - _php_stream_write_filtered(stream, IS_STRING, (zstr)NULL, 0, closing ? PSFS_FLAG_FLUSH_CLOSE : PSFS_FLAG_FLUSH_INC TSRMLS_CC); + _php_stream_write_filtered(stream, IS_STRING, ZSTR(NULL), 0, closing ? PSFS_FLAG_FLUSH_CLOSE : PSFS_FLAG_FLUSH_INC TSRMLS_CC); } if (stream->ops->flush) { @@ -1352,9 +1352,9 @@ PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t coun } if (stream->writefilters.head) { - return _php_stream_write_filtered(stream, IS_STRING, (zstr)((char*)buf), count, PSFS_FLAG_NORMAL TSRMLS_CC); + return _php_stream_write_filtered(stream, IS_STRING, ZSTR((void*)buf), count, PSFS_FLAG_NORMAL TSRMLS_CC); } else { - return _php_stream_write_buffer(stream, IS_STRING, (zstr)((char*)buf), count TSRMLS_CC); + return _php_stream_write_buffer(stream, IS_STRING, ZSTR((void*)buf), count TSRMLS_CC); } } @@ -1367,9 +1367,9 @@ PHPAPI size_t _php_stream_write_unicode(php_stream *stream, const UChar *buf, in } if (stream->writefilters.head) { - ret = _php_stream_write_filtered(stream, IS_UNICODE, (zstr)((UChar*)buf), count, PSFS_FLAG_NORMAL TSRMLS_CC); + ret = _php_stream_write_filtered(stream, IS_UNICODE, ZSTR((void*)buf), count, PSFS_FLAG_NORMAL TSRMLS_CC); } else { - ret = _php_stream_write_buffer(stream, IS_UNICODE, (zstr)((UChar*)buf), count TSRMLS_CC); + ret = _php_stream_write_buffer(stream, IS_UNICODE, ZSTR((void*)buf), count TSRMLS_CC); } return ret; -- 2.50.1