Use correct int types

Author: rhpvorderman

src/isal/crc.pxd

@@ -21,8 +21,8 @@
 # cython: language_level=3
 
 cdef extern from "<isa-l/crc.h>":
-    cdef unsigned long crc32_gzip_refl(
-    unsigned long init_crc,          #!< initial CRC value, 32 bits
+    cdef unsigned int crc32_gzip_refl(
+    unsigned int init_crc,          #!< initial CRC value, 32 bits
     const unsigned char *buf, #!< buffer to calculate CRC on
     unsigned long long len                #!< buffer length in bytes (64-bit data)
     )

src/isal/igzip_lib.pxd

@@ -449,6 +449,6 @@ cdef extern from "<isa-l/igzip_lib.h>":
     #  *
     #  * @returns 32-bit Adler-32 checksum
     #  */
-    unsigned long isal_adler32(unsigned int init,
+    unsigned int isal_adler32(unsigned int init,
                                const unsigned char *buf, 
                                unsigned long long len)

src/isal/isal_zlib.pyx

@@ -83,7 +83,7 @@ if ISAL_DEF_MAX_HIST_BITS > zlib.MAX_WBITS:
                      "Please contact the developers.")
 
 
-cpdef adler32(data, unsigned long value = 1):
+cpdef adler32(data, unsigned int value = 1):
     cdef Py_buffer buffer_data
     cdef Py_buffer* buffer = &buffer_data
     if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
@@ -95,7 +95,7 @@ cpdef adler32(data, unsigned long value = 1):
     finally:
         PyBuffer_Release(buffer)
 
-cpdef crc32(data, unsigned long value = 0):
+cpdef crc32(data, unsigned int value = 0):
     cdef Py_buffer buffer_data
     cdef Py_buffer* buffer = &buffer_data
     if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
@@ -117,14 +117,14 @@ ctypedef fused stream_or_state:
     isal_zstream
     inflate_state
 
-cdef unsigned long unsigned_long_min(unsigned long a, unsigned long b):
+cdef unsigned int unsigned_int_min(unsigned int a, unsigned int b):
     if a <= b:
         return a
     else:
         return b
 
 cdef void arrange_input_buffer(stream_or_state *stream, Py_ssize_t *remains):
-    stream.avail_in = unsigned_long_min(<unsigned long>remains[0], UINT32_MAX)
+    stream.avail_in = unsigned_int_min(<unsigned int>remains[0], UINT32_MAX)
     remains[0] -= stream.avail_in
 
 def compress(data,
@@ -135,7 +135,7 @@ def compress(data,
 
     # Initialise stream
     cdef isal_zstream stream
-    cdef unsigned long level_buf_size = zlib_mem_level_to_isal(level, DEF_MEM_LEVEL)
+    cdef unsigned int level_buf_size = zlib_mem_level_to_isal(level, DEF_MEM_LEVEL)
     cdef unsigned char* level_buf = <unsigned char*> PyMem_Malloc(level_buf_size * sizeof(char))
     isal_deflate_init(&stream)
     stream.level = level
@@ -146,7 +146,7 @@ def compress(data,
                                         &stream.gzip_flag)
 
     # Initialise output buffer
-    cdef unsigned long obuflen = DEF_BUF_SIZE
+    cdef unsigned int obuflen = DEF_BUF_SIZE
     cdef unsigned char * obuf = <unsigned char*> PyMem_Malloc(obuflen * sizeof(char))
     out = []
 
@@ -223,7 +223,7 @@ cpdef decompress(data,
     stream.next_in = ibuf
 
     # Initialise output buffer
-    cdef unsigned long obuflen = bufsize
+    cdef unsigned int obuflen = bufsize
     cdef unsigned char * obuf = <unsigned char*> PyMem_Malloc(obuflen * sizeof(char))
     out = []
     cdef int err
@@ -281,7 +281,7 @@ cdef class Compress:
     cdef isal_zstream stream
     cdef unsigned char * level_buf
     cdef unsigned char * obuf
-    cdef unsigned long obuflen
+    cdef unsigned int obuflen
 
     def __cinit__(self,
                   int level = ISAL_DEFAULT_COMPRESSION,
@@ -394,7 +394,7 @@ cdef class Decompress:
     cdef bint is_initialised
     cdef inflate_state stream
     cdef unsigned char * obuf
-    cdef unsigned long obuflen
+    cdef unsigned int obuflen
 
     def __cinit__(self, wbits=ISAL_DEF_MAX_HIST_BITS, zdict = None):
         isal_inflate_init(&self.stream)
@@ -451,8 +451,8 @@ cdef class Decompress:
         cdef unsigned char * ibuf = <unsigned char*>buffer.buf
         self.stream.next_in = ibuf
         self.stream.avail_out = 0
-        cdef unsigned long prev_avail_out
-        cdef unsigned long bytes_written
+        cdef unsigned int prev_avail_out
+        cdef unsigned int bytes_written
         cdef Py_ssize_t unused_bytes
         cdef int err
 
@@ -510,10 +510,10 @@ cdef class Decompress:
         cdef unsigned char * ibuf = <unsigned char*>buffer.buf
         self.stream.next_in = ibuf
 
-        cdef unsigned long total_bytes = 0
-        cdef unsigned long bytes_written
+        cdef unsigned int total_bytes = 0
+        cdef unsigned int bytes_written
         out = []
-        cdef unsigned long obuflen = length
+        cdef unsigned int obuflen = length
         cdef unsigned char * obuf = <unsigned char *>PyMem_Malloc(obuflen * sizeof(char))
         cdef Py_ssize_t unused_bytes
 
@@ -557,8 +557,8 @@ cdef wbits_to_flag_and_hist_bits_deflate(int wbits,
 
 
 cdef wbits_to_flag_and_hist_bits_inflate(int wbits,
-                                         unsigned long * hist_bits,
-                                         unsigned long * crc_flag):
+                                         unsigned int * hist_bits,
+                                         unsigned int * crc_flag):
     if wbits == 0:
         hist_bits[0] = 0
         crc_flag[0] = ISAL_ZLIB