diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/binascii.c | 8 | ||||
| -rw-r--r-- | Modules/zlibmodule.c | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c index b90905f..b65bdab 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -784,13 +784,15 @@ PyDoc_STRVAR(doc_crc32, static PyObject * binascii_crc32(PyObject *self, PyObject *args) { - uLong crc32val = 0; /* crc32(0L, Z_NULL, 0) */ + unsigned int crc32val = 0; /* crc32(0L, Z_NULL, 0) */ Byte *buf; Py_ssize_t len; + int signed_val; + if (!PyArg_ParseTuple(args, "s#|I:crc32", &buf, &len, &crc32val)) return NULL; - crc32val = crc32(crc32val, buf, len); - return PyLong_FromUnsignedLong(crc32val & 0xffffffffU); + signed_val = crc32(crc32val, buf, len); + return PyLong_FromUnsignedLong(signed_val & 0xffffffffU); } #else /* USE_ZLIB_CRC32 */ /* Crc - 32 BIT ANSI X3.66 CRC checksum files diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index cecb9cf..24efb00 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -915,7 +915,7 @@ PyDoc_STRVAR(adler32__doc__, static PyObject * PyZlib_adler32(PyObject *self, PyObject *args) { - uLong adler32val = 1; /* adler32(0L, Z_NULL, 0) */ + unsigned int adler32val = 1; /* adler32(0L, Z_NULL, 0) */ Byte *buf; int len; @@ -934,13 +934,14 @@ PyDoc_STRVAR(crc32__doc__, static PyObject * PyZlib_crc32(PyObject *self, PyObject *args) { - uLong crc32val = 0; /* crc32(0L, Z_NULL, 0) */ + unsigned int crc32val = 0; /* crc32(0L, Z_NULL, 0) */ Byte *buf; - int len; + int len, signed_val; + if (!PyArg_ParseTuple(args, "s#|I:crc32", &buf, &len, &crc32val)) return NULL; - crc32val = crc32(crc32val, buf, len); - return PyLong_FromUnsignedLong(crc32val & 0xffffffffU); + signed_val = crc32(crc32val, buf, len); + return PyLong_FromUnsignedLong(signed_val & 0xffffffffU); } |