Issue #9566: Explicit downcast to fix compiler warnings on Win64

vstinner · vstinner · commit 56cb12542d7e · 2012-10-31T00:33:57.000+01:00
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
@@ -22,7 +22,9 @@
 #  define FAULTHANDLER_USER
 #endif
 
-#define PUTS(fd, str) write(fd, str, strlen(str))
+/* cast size_t to int because write() takes an int on Windows
+   (anyway, the length is smaller than 30 characters) */
+#define PUTS(fd, str) write(fd, str, (int)strlen(str))
 
 #ifdef HAVE_SIGACTION
 typedef struct sigaction _Py_sighandler_t;
@@ -445,7 +447,7 @@ faulthandler_thread(void *unused)
         /* get the thread holding the GIL, NULL if no thread hold the GIL */
         current = _Py_atomic_load_relaxed(&_PyThreadState_Current);
 
-        write(thread.fd, thread.header, thread.header_len);
+        write(thread.fd, thread.header, (int)thread.header_len);
 
         errmsg = _Py_DumpTracebackThreads(thread.fd, thread.interp, current);
         ok = (errmsg == NULL);
diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -246,7 +246,7 @@ md5_process(struct md5_state *md5, const unsigned char *in, Py_ssize_t inlen)
         } else {
            n = MIN(inlen, (Py_ssize_t)(MD5_BLOCKSIZE - md5->curlen));
            memcpy(md5->buf + md5->curlen, in, (size_t)n);
-           md5->curlen    += n;
+           md5->curlen    += (MD5_INT32)n;
            in             += n;
            inlen          -= n;
            if (md5->curlen == MD5_BLOCKSIZE) {
diff --git a/Modules/sha1module.c b/Modules/sha1module.c
@@ -222,7 +222,7 @@ sha1_process(struct sha1_state *sha1,
         } else {
            n = MIN(inlen, (Py_ssize_t)(SHA1_BLOCKSIZE - sha1->curlen));
            memcpy(sha1->buf + sha1->curlen, in, (size_t)n);
-           sha1->curlen   += n;
+           sha1->curlen   += (SHA1_INT32)n;
            in             += n;
            inlen          -= n;
            if (sha1->curlen == SHA1_BLOCKSIZE) {
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
@@ -161,7 +161,7 @@ PyZlib_compress(PyObject *self, PyObject *args)
         goto error;
     }
     input = pinput.buf;
-    length = pinput.len;
+    length = (unsigned int)pinput.len;
 
     zst.avail_out = length + length/1000 + 12 + 1;
 
@@ -251,7 +251,7 @@ PyZlib_decompress(PyObject *self, PyObject *args)
         goto error;
     }
     input = pinput.buf;
-    length = pinput.len;
+    length = (unsigned int)pinput.len;
 
     if (r_strlen <= 0)
         r_strlen = 1;

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ PyZlib_compress(PyObject self, PyObject args)`
`161`	`161`	`goto error;`
`162`	`162`	`}`
`163`	`163`	`input = pinput.buf;`
`164`		`- length = pinput.len;`
	`164`	`+ length = (unsigned int)pinput.len;`
`165`	`165`
`166`	`166`	`zst.avail_out = length + length/1000 + 12 + 1;`
`167`	`167`
`@@ -251,7 +251,7 @@ PyZlib_decompress(PyObject self, PyObject args)`
`251`	`251`	`goto error;`
`252`	`252`	`}`
`253`	`253`	`input = pinput.buf;`
`254`		`- length = pinput.len;`
	`254`	`+ length = (unsigned int)pinput.len;`
`255`	`255`
`256`	`256`	`if (r_strlen <= 0)`
`257`	`257`	`r_strlen = 1;`