cvs: php4 /main streams.c

wez Sun Oct 13 19:43:46 2002 EDT Modified files: /php4/main streams.c Log: Remove some old code. Index: php4/main/streams.c diff -u php4/main/streams.c:1.102 php4/main/streams.c:1.103 --- php4/main/streams.c:1.102 Sun Oct 13 18:52:33 2002 +++ php4/main/streams.c Sun Oct 13 19:43:46 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.102 2002/10/13 22:52:33 wez Exp $ */ +/* $Id: streams.c,v 1.103 2002/10/13 23:43:46 wez Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -544,7 +544,7 @@ if (toread > size) toread = size; - if (toread) { + if (toread > 0) { memcpy(buf, stream->readbuf + stream->readpos, toread); stream->readpos += toread; } @@ -572,14 +572,6 @@ return 0; return stream->eof; - - /* we define our stream reading function so that it - must return EOF when an EOF condition occurs, when - working in unbuffered mode and called with these args */ - if (stream->filterhead) - return stream->filterhead->fops->eof(stream, stream->filterhead TSRMLS_CC); - - return stream->ops->read(stream, NULL, 0 TSRMLS_CC) == EOF ? 1 : 0; } PHPAPI int _php_stream_putc(php_stream *stream, int c TSRMLS_DC)