diff options
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/binascii.c | 16 | ||||
-rw-r--r-- | Modules/clinic/binascii.c.h | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c index 4e4faa9..ceee4f1 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -908,31 +908,31 @@ binascii_rledecode_hqx_impl(PyModuleDef *module, Py_buffer *data) /*[clinic input] -binascii.crc_hqx -> int +binascii.crc_hqx -> unsigned_int data: Py_buffer - crc: int + crc: unsigned_int(bitwise=True) / Compute hqx CRC incrementally. [clinic start generated code]*/ -static int -binascii_crc_hqx_impl(PyModuleDef *module, Py_buffer *data, int crc) -/*[clinic end generated code: output=634dac18dfa863d7 input=68060931b2f51c8a]*/ +static unsigned int +binascii_crc_hqx_impl(PyModuleDef *module, Py_buffer *data, unsigned int crc) +/*[clinic end generated code: output=167c2dac62625717 input=add8c53712ccceda]*/ { unsigned char *bin_data; - unsigned int ucrc = (unsigned int)crc; Py_ssize_t len; + crc &= 0xffff; bin_data = data->buf; len = data->len; while(len-- > 0) { - ucrc=((ucrc<<8)&0xff00)^crctab_hqx[((ucrc>>8)&0xff)^*bin_data++]; + crc = ((crc<<8)&0xff00) ^ crctab_hqx[(crc>>8)^*bin_data++]; } - return (int)ucrc; + return crc; } #ifndef USE_ZLIB_CRC32 diff --git a/Modules/clinic/binascii.c.h b/Modules/clinic/binascii.c.h index d7c2ee6..25d39d2 100644 --- a/Modules/clinic/binascii.c.h +++ b/Modules/clinic/binascii.c.h @@ -267,25 +267,25 @@ PyDoc_STRVAR(binascii_crc_hqx__doc__, #define BINASCII_CRC_HQX_METHODDEF \ {"crc_hqx", (PyCFunction)binascii_crc_hqx, METH_VARARGS, binascii_crc_hqx__doc__}, -static int -binascii_crc_hqx_impl(PyModuleDef *module, Py_buffer *data, int crc); +static unsigned int +binascii_crc_hqx_impl(PyModuleDef *module, Py_buffer *data, unsigned int crc); static PyObject * binascii_crc_hqx(PyModuleDef *module, PyObject *args) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - int crc; - int _return_value; + unsigned int crc; + unsigned int _return_value; if (!PyArg_ParseTuple(args, - "y*i:crc_hqx", + "y*I:crc_hqx", &data, &crc)) goto exit; _return_value = binascii_crc_hqx_impl(module, &data, crc); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) goto exit; - return_value = PyLong_FromLong((long)_return_value); + return_value = PyLong_FromUnsignedLong((unsigned long)_return_value); exit: /* Cleanup for data */ @@ -544,4 +544,4 @@ exit: return return_value; } -/*[clinic end generated code: output=175025a8a94fbdd1 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5f8d3578618b3432 input=a9049054013a1b77]*/ |