summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2002-10-13 23:43:46 +0000
committerWez Furlong <wez@php.net>2002-10-13 23:43:46 +0000
commit2d97f4d4c747dc4b128d5ab54a1e4b51c597634c (patch)
tree4713a6dec51a1baf3e3d3f8762a8690628c45f2a /main
parent0bcd2ccb2cb487ac47a065a9c07c85e7f21ebbbd (diff)
downloadphp-git-2d97f4d4c747dc4b128d5ab54a1e4b51c597634c.tar.gz
Remove some old code.
Diffstat (limited to 'main')
-rwxr-xr-xmain/streams.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/main/streams.c b/main/streams.c
index 6198ca8321..177e78ba2b 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -544,7 +544,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
if (toread > size)
toread = size;
- if (toread) {
+ if (toread > 0) {
memcpy(buf, stream->readbuf + stream->readpos, toread);
stream->readpos += toread;
}
@@ -572,14 +572,6 @@ PHPAPI int _php_stream_eof(php_stream *stream TSRMLS_DC)
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)