mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 15:09:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 88464,88466 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2011-02-21 19:31:38 +00:00
parent 0accdfa00b
commit bf709fe08c
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Modules/zlibmodule.c
View file

@ -945,16 +945,16 @@ PyZlib_adler32(PyObject *self, PyObject *args)
/* Releasing the GIL for very small buffers is inefficient /* Releasing the GIL for very small buffers is inefficient
and may lower performance */ and may lower performance */
if (pbuf.len > 1024*5) { if (pbuf.len > 1024*5) {
void *buf = pbuf.buf; unsigned char *buf = pbuf.buf;
Py_ssize_t len = pbuf.len; Py_ssize_t len = pbuf.len;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
/* Avoid truncation of length for very large buffers. adler32() takes /* Avoid truncation of length for very large buffers. adler32() takes
length as an unsigned int, which may be narrower than Py_ssize_t. */ 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); adler32val = adler32(adler32val, buf, UINT_MAX);
buf += UINT_MAX; buf += (size_t) UINT_MAX;
len -= UINT_MAX; len -= (size_t) UINT_MAX;
} }
adler32val = adler32(adler32val, buf, len); adler32val = adler32(adler32val, buf, len);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
@ -983,16 +983,16 @@ PyZlib_crc32(PyObject *self, PyObject *args)
/* Releasing the GIL for very small buffers is inefficient /* Releasing the GIL for very small buffers is inefficient
and may lower performance */ and may lower performance */
if (pbuf.len > 1024*5) { if (pbuf.len > 1024*5) {
void *buf = pbuf.buf; unsigned char *buf = pbuf.buf;
Py_ssize_t len = pbuf.len; Py_ssize_t len = pbuf.len;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
/* Avoid truncation of length for very large buffers. crc32() takes /* Avoid truncation of length for very large buffers. crc32() takes
length as an unsigned int, which may be narrower than Py_ssize_t. */ 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); crc32val = crc32(crc32val, buf, UINT_MAX);
buf += UINT_MAX; buf += (size_t) UINT_MAX;
len -= UINT_MAX; len -= (size_t) UINT_MAX;
} }
signed_val = crc32(crc32val, buf, len); signed_val = crc32(crc32val, buf, len);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS