[Python-checkins] r88468 - in python/branches/release32-maint: Modules/zlibmodule.c
antoine.pitrou
python-checkins at python.org
Mon Feb 21 20:31:38 CET 2011
Author: antoine.pitrou
Date: Mon Feb 21 20:31:38 2011
New Revision: 88468
Log:
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.
........
Modified:
python/branches/release32-maint/ (props changed)
python/branches/release32-maint/Modules/zlibmodule.c
Modified: python/branches/release32-maint/Modules/zlibmodule.c
==============================================================================
--- python/branches/release32-maint/Modules/zlibmodule.c (original)
+++ python/branches/release32-maint/Modules/zlibmodule.c Mon Feb 21 20:31:38 2011
@@ -945,16 +945,16 @@
/* 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 @@
/* 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
More information about the Python-checkins
mailing list