Use safer comparisons (only matters when sizeof(int) != sizeof(size_t)). fread

and fwrite return size_t, so it is safer to cast up to the largest type for the
comparison. I believe the cast is required at all to remove compiler warnings.

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index ec1b08d405e8787e2d1c51f576766fb795c926dc..6648c9c0b3b907f9f7187dc9a311ddca6ec871c2 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1039,8 +1039,8 @@ array_tofile(arrayobject *self, PyObject *args)
                return NULL;
        }
        if (self->ob_size > 0) {
-               if ((int)fwrite(self->ob_item, self->ob_descr->itemsize,
-                          self->ob_size, fp) != self->ob_size) {
+               if (fwrite(self->ob_item, self->ob_descr->itemsize,
+                          self->ob_size, fp) != (size_t)self->ob_size) {
                        PyErr_SetFromErrno(PyExc_IOError);
                        clearerr(fp);
                        return NULL;

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 5a136b99d1e8cfc6708dc2a5fa0d9ca61641711e..b64b1f137799a8bc3f75f6aebefaffcb02a00e29 100644 (file)
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -407,7 +407,7 @@ write_file(Picklerobject *self, char *s, int  n) {
         return 0;
     }
 
-    if ((int)fwrite(s, sizeof(char), n, self->fp) != n) {
+    if (fwrite(s, sizeof(char), n, self->fp) != (size_t)n) {
         PyErr_SetFromErrno(PyExc_IOError);
         return -1;
     }
@@ -503,7 +503,7 @@ read_file(Unpicklerobject *self, char **s, int  n) {
         self->buf_size = n;
     }
             
-    if ((int)fread(self->buf, sizeof(char), n, self->fp) != n) {  
+    if (fread(self->buf, sizeof(char), n, self->fp) != (size_t)n) {
         if (feof(self->fp)) {
             PyErr_SetNone(PyExc_EOFError);
             return -1;