From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 21 Feb 2011 19:31:38 +0000 (+0000)
Subject: Merged revisions 88464,88466 via svnmerge from
X-Git-Tag: v3.2.1b1~403
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf709fe08c04e279d77af83f7d9f577087fe86d9;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 88464,88466 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88464 | antoine.pitrou | 2011-02-21 20:05:08 +0100 (lun., 21 févr. 2011) | 3 lines

  Fix issues on 32-bit systems introduced by r88460
........
  r88466 | antoine.pitrou | 2011-02-21 20:28:40 +0100 (lun., 21 févr. 2011) | 3 lines

  Fix compile error under MSVC introduced by r88460.
........
---

diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index e439c5b964f9..206ef0c6d8c1 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -945,16 +945,16 @@ PyZlib_adler32(PyObject *self, PyObject *args)
     /* Releasing the GIL for very small buffers is inefficient
        and may lower performance */
     if (pbuf.len > 1024*5) {
-        void *buf = pbuf.buf;
+        unsigned char *buf = pbuf.buf;
         Py_ssize_t len = pbuf.len;
 
         Py_BEGIN_ALLOW_THREADS
         /* Avoid truncation of length for very large buffers. adler32() takes
            length as an unsigned int, which may be narrower than Py_ssize_t. */
-        while (len > (Py_ssize_t)UINT_MAX) {
+        while (len > (size_t) UINT_MAX) {
             adler32val = adler32(adler32val, buf, UINT_MAX);
-            buf += UINT_MAX;
-            len -= UINT_MAX;
+            buf += (size_t) UINT_MAX;
+            len -= (size_t) UINT_MAX;
         }
         adler32val = adler32(adler32val, buf, len);
         Py_END_ALLOW_THREADS
@@ -983,16 +983,16 @@ PyZlib_crc32(PyObject *self, PyObject *args)
     /* Releasing the GIL for very small buffers is inefficient
        and may lower performance */
     if (pbuf.len > 1024*5) {
-        void *buf = pbuf.buf;
+        unsigned char *buf = pbuf.buf;
         Py_ssize_t len = pbuf.len;
 
         Py_BEGIN_ALLOW_THREADS
         /* Avoid truncation of length for very large buffers. crc32() takes
            length as an unsigned int, which may be narrower than Py_ssize_t. */
-        while (len > (Py_ssize_t)UINT_MAX) {
+        while (len > (size_t) UINT_MAX) {
             crc32val = crc32(crc32val, buf, UINT_MAX);
-            buf += UINT_MAX;
-            len -= UINT_MAX;
+            buf += (size_t) UINT_MAX;
+            len -= (size_t) UINT_MAX;
         }
         signed_val = crc32(crc32val, buf, len);
         Py_END_ALLOW_THREADS