summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2012-10-31 00:33:57 +0100
committerVictor Stinner <victor.stinner@gmail.com>2012-10-31 00:33:57 +0100
commit56cb12542d7ea5c95b9483e3db69388bcbc2ffbb (patch)
tree2c66f16414127cfe2dcd99e1a9af08eb83ee8de9 /Modules
parent4ca1cf35fbf042700dfeaf7bf27d3d476eff32a6 (diff)
downloadcpython-git-56cb12542d7ea5c95b9483e3db69388bcbc2ffbb.tar.gz
Issue #9566: Explicit downcast to fix compiler warnings on Win64
Diffstat (limited to 'Modules')
-rw-r--r--Modules/faulthandler.c6
-rw-r--r--Modules/md5module.c2
-rw-r--r--Modules/sha1module.c2
-rw-r--r--Modules/zlibmodule.c4
4 files changed, 8 insertions, 6 deletions
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index b0df93c8a1..f49993d0f3 100644
--- 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
index e2681a8ae5..4ecbb06baf 100644
--- 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
index a733c4b5bb..ab93f68f0d 100644
--- 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
index 6519194fb5..a53a5f0211 100644
--- 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;