pollita Wed Mar 15 00:28:57 2006 UTC
Modified files:
/php-src/ext/standard file.c
/php-src/main/streams streams.c
Log:
Switch (zstr) casts to use ZSTR() macro.
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.426&r2=1.427&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.426 php-src/ext/standard/file.c:1.427
--- php-src/ext/standard/file.c:1.426 Tue Mar 14 21:15:05 2006
+++ php-src/ext/standard/file.c Wed Mar 15 00:28:57 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.426 2006/03/14 21:15:05 pollita Exp $ */
+/* $Id: file.c,v 1.427 2006/03/15 00:28:57 pollita Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -749,7 +749,7 @@
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;
}
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.102&r2=1.103&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.102
php-src/main/streams/streams.c:1.103
--- php-src/main/streams/streams.c:1.102 Tue Mar 14 21:15:05 2006
+++ php-src/main/streams/streams.c Wed Mar 15 00:28:57 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.102 2006/03/14 21:15:05 pollita Exp $ */
+/* $Id: streams.c,v 1.103 2006/03/15 00:28:57 pollita Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1335,7 +1335,7 @@
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 @@
}
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 @@
}
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
