[PHP-CVS] cvs: php4 /ext/ftp ftp.c /main php_streams.h streams.c

[Wez Furlong]

wez             Mon Sep 23 10:50:22 2002 EDT

  Modified files:              
    /php4/main  php_streams.h streams.c 
    /php4/ext/ftp       ftp.c 
  Log:
  fix some warnings.
  
  
Index: php4/main/php_streams.h
diff -u php4/main/php_streams.h:1.45 php4/main/php_streams.h:1.46
--- php4/main/php_streams.h:1.45        Mon Sep 23 09:22:10 2002
+++ php4/main/php_streams.h     Mon Sep 23 10:50:20 2002
@@ -255,8 +255,8 @@
        off_t position; /* of underlying stream */
        unsigned char *readbuf;
        size_t readbuflen;
-       size_t readpos;
-       size_t writepos;
+       off_t readpos;
+       off_t writepos;
        
        /* how much data to read when filling buffer */
        size_t chunk_size;
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.76 php4/main/streams.c:1.77
--- php4/main/streams.c:1.76    Mon Sep 23 09:22:10 2002
+++ php4/main/streams.c Mon Sep 23 10:50:21 2002
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.76 2002/09/23 13:22:10 wez Exp $ */
+/* $Id: streams.c,v 1.77 2002/09/23 14:50:21 wez Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -512,7 +512,7 @@
                        eol = memchr(readptr, '\n', avail);
                }
 
-               if (eol && (eol + 1 - readptr) <= maxlen - 1) {
+               if (eol && ((ptrdiff_t)eol + 1 - (ptrdiff_t)readptr) <= maxlen - 1) {
                        justread = eol + 1 - readptr;
                } else {
                        eol = NULL;
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.62 php4/ext/ftp/ftp.c:1.63
--- php4/ext/ftp/ftp.c:1.62     Wed Sep 11 06:28:22 2002
+++ php4/ext/ftp/ftp.c  Mon Sep 23 10:50:21 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ftp.c,v 1.62 2002/09/11 10:28:22 hyanantha Exp $ */
+/* $Id: ftp.c,v 1.63 2002/09/23 14:50:21 wez Exp $ */
 
 #include "php.h"
 
@@ -571,7 +571,7 @@
        databuf_t               *data = NULL;
        char                    *ptr;
        int                     lastch;
-       int                     rcvd;
+       size_t                  rcvd;
        char                    arg[11];
        TSRMLS_FETCH();
 
@@ -1443,7 +1443,7 @@
        databuf_t       *data = NULL;
        char            *ptr;
        int                     lastch;
-       int                     rcvd;
+       size_t          rcvd;
        ftptype_t       type;
        TSRMLS_FETCH();
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php