]> granicus.if.org Git - php/commitdiff
Hopefully fix the other warnings that my last warning-fixing commit caused.
authorWez Furlong <wez@php.net>
Mon, 23 Sep 2002 15:21:16 +0000 (15:21 +0000)
committerWez Furlong <wez@php.net>
Mon, 23 Sep 2002 15:21:16 +0000 (15:21 +0000)
main/streams.c

index bcb210aa2d26fdb3d061f22999814c93d735e035..8453da767ecc1224919263d832b2b5418e9fd435 100755 (executable)
@@ -33,6 +33,8 @@
 #include <sys/mman.h>
 #endif
 
+#include <stddef.h>
+
 #include <fcntl.h>
 
 #ifndef MAP_FAILED
@@ -320,7 +322,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
        /* allocate/fill the buffer */
        
        /* is there enough data in the buffer ? */
-       while (stream->writepos - stream->readpos < size) {
+       while (stream->writepos - stream->readpos < (off_t)size) {
                size_t justread;
                
                /* no; so lets fetch more data */
@@ -390,7 +392,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
        } else {
                php_stream_fill_read_buffer(stream, size TSRMLS_CC);
 
-               if (size > stream->writepos - stream->readpos)
+               if ((off_t)size > stream->writepos - stream->readpos)
                        size = stream->writepos - stream->readpos;
 
                memcpy(buf, stream->readbuf + stream->readpos, size);