wez Sat Aug 13 15:22:04 2005 EDT
Modified files:
/php-src/main/streams streams.c
Log:
a bit of pedantic ws
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.84&r2=1.85&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.84 php-src/main/streams/streams.c:1.85
--- php-src/main/streams/streams.c:1.84 Fri Aug 12 19:21:29 2005
+++ php-src/main/streams/streams.c Sat Aug 13 15:22:03 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.84 2005/08/12 23:21:29 tony2001 Exp $ */
+/* $Id: streams.c,v 1.85 2005/08/13 19:22:03 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -708,17 +708,17 @@
/* It's possible that we have a readbuf, but that it's only half of a
surrogate pair */
if (!stream->readbuf.head ||
- (stream->readbuf.head == stream->readbuf.tail &&
stream->readbuf.head->is_unicode &&
- (stream->readbuf.head->buf.ustr.len - stream->readbuf_ofs) == 1
&&
-
U16_IS_SURROGATE(stream->readbuf.head->buf.ustr.val[stream->readbuf.head->buf.ustr.len-1])))
{
+ (stream->readbuf.head == stream->readbuf.tail &&
stream->readbuf.head->is_unicode &&
+ (stream->readbuf.head->buf.ustr.len -
stream->readbuf_ofs) == 1 &&
+
U16_IS_SURROGATE(stream->readbuf.head->buf.ustr.val[stream->readbuf.head->buf.ustr.len-1])))
{
php_stream_fill_read_buffer(stream, max_bytes ? max_bytes :
(max_chars ? max_chars : stream->chunk_size) TSRMLS_CC);
}
if (!stream->readbuf.head ||
- (stream->readbuf.head == stream->readbuf.tail &&
stream->readbuf.head->is_unicode &&
- (stream->readbuf.head->buf.ustr.len - stream->readbuf_ofs) == 1
&&
-
U16_IS_SURROGATE(stream->readbuf.head->buf.ustr.val[stream->readbuf.head->buf.ustr.len-1])))
{
+ (stream->readbuf.head == stream->readbuf.tail &&
stream->readbuf.head->is_unicode &&
+ (stream->readbuf.head->buf.ustr.len -
stream->readbuf_ofs) == 1 &&
+
U16_IS_SURROGATE(stream->readbuf.head->buf.ustr.val[stream->readbuf.head->buf.ustr.len-1])))
{
/* Nothing to return */
*pnum_bytes = 0;
*pnum_chars = 0;
@@ -761,7 +761,7 @@
if ((bucket = stream->readbuf.head)) {
if ((bucket->is_unicode && !is_unicode) ||
- (!bucket->is_unicode && is_unicode)) {
+ (!bucket->is_unicode && is_unicode)) {
/* data type swap, exit now */
break;
}
@@ -804,8 +804,8 @@
php_stream_bucket_delref(bucket
TSRMLS_CC);
stream->readbuf_ofs = 0;
} else if (stream->readbuf_ofs ==
(bucket->buf.ustr.len - 1) &&
-
U16_IS_SURROGATE(bucket->buf.ustr.val[bucket->buf.ustr.len - 1]) &&
- bucket->next &&
bucket->next->is_unicode) {
+
U16_IS_SURROGATE(bucket->buf.ustr.val[bucket->buf.ustr.len - 1]) &&
+ bucket->next &&
bucket->next->is_unicode) {
/* Only one char left in the bucket,
avoid already split surrogates getting "stuck" -- Should never happen thanks to
fill_read_buffer */
php_stream_bucket *next_bucket =
bucket->next;
@@ -1272,7 +1272,7 @@
}
if ((max_bytes >= 0 && num_bytes >= max_bytes) ||
- (max_chars >= 0 && num_chars >= max_chars)) {
+ (max_chars >= 0 && num_chars >=
max_chars)) {
goto exit_ugetline;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
