[Python-checkins] r61874 - python/trunk/Modules/binascii.c python/trunk/Modules/zlibmodule.c

Tue Mar 25 08:31:28 CET 2008

Author: gregory.p.smith
Date: Tue Mar 25 08:31:28 2008
New Revision: 61874
Modified:
 python/trunk/Modules/binascii.c
 python/trunk/Modules/zlibmodule.c
Log:
Use a 32-bit unsigned int here, a long is not needed.
Modified: python/trunk/Modules/binascii.c
==============================================================================

--- python/trunk/Modules/binascii.c	(original)
+++ python/trunk/Modules/binascii.c	Tue Mar 25 08:31:28 2008
@@ -756,12 +756,12 @@
 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#|k:crc32", &buf, &len, &crc32val))
+ if (!PyArg_ParseTuple(args, "s#|I:crc32", &buf, &len, &crc32val))
 	return NULL;
 /* In Python 2.x we return a signed integer regardless of native platform
 * long size (the 32bit unsigned long is treated as 32-bit signed and sign
Modified: python/trunk/Modules/zlibmodule.c
==============================================================================
--- python/trunk/Modules/zlibmodule.c	(original)
+++ python/trunk/Modules/zlibmodule.c	Tue Mar 25 08:31:28 2008
@@ -889,11 +889,11 @@
 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, signed_val;
 
- if (!PyArg_ParseTuple(args, "s#|k:adler32", &buf, &len, &adler32val))
+ if (!PyArg_ParseTuple(args, "s#|I:adler32", &buf, &len, &adler32val))
 	return NULL;
 /* In Python 2.x we return a signed integer regardless of native platform
 * long size (the 32bit unsigned long is treated as 32-bit signed and sign
@@ -912,11 +912,11 @@
 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, signed_val;
 
- if (!PyArg_ParseTuple(args, "s#|k:crc32", &buf, &len, &crc32val))
+ if (!PyArg_ParseTuple(args, "s#|I:crc32", &buf, &len, &crc32val))
 	return NULL;
 /* In Python 2.x we return a signed integer regardless of native platform
 * long size (the 32bit unsigned long is treated as 32-bit signed and sign
