Small code style changes

Author: rhpvorderman

src/isal/_isalmodule.c

@@ -27,9 +27,7 @@ static struct PyModuleDef _isal_module = {
 PyMODINIT_FUNC
 PyInit__isal(void)
 {
-    PyObject *m;
-
-    m = PyModule_Create(&_isal_module);
+    PyObject *m = PyModule_Create(&_isal_module);
     if (m == NULL) {
         return NULL;
     }

src/isal/igzip_libmodule.c

@@ -57,7 +57,7 @@ decompress_buf(IgzipDecompressor *self, Py_ssize_t max_length)
     /* data_size is strictly positive, but because we repeatedly have to
        compare against max_length and PyBytes_GET_SIZE we declare it as
        signed */
-    PyObject * RetVal = NULL;
+    PyObject *RetVal = NULL;
     Py_ssize_t hard_limit;
 
     Py_ssize_t obuflen;
@@ -187,11 +187,11 @@ decompress(IgzipDecompressor *self, uint8_t *data, size_t len, Py_ssize_t max_le
         self->needs_input = 0;
         Py_ssize_t bytes_in_bitbuffer = bitbuffer_size(&(self->state));
         if (self->avail_in_real + bytes_in_bitbuffer > 0) {
-            PyObject * new_data = PyBytes_FromStringAndSize(
+            PyObject *new_data = PyBytes_FromStringAndSize(
                 NULL, self->avail_in_real + bytes_in_bitbuffer);
             if (new_data == NULL)
                 goto error;
-            char * new_data_ptr = PyBytes_AS_STRING(new_data);
+            char *new_data_ptr = PyBytes_AS_STRING(new_data);
             bitbuffer_copy(&(self->state), new_data_ptr, bytes_in_bitbuffer);
             memcpy(new_data_ptr + bytes_in_bitbuffer, self->state.next_in, 
                    self->avail_in_real);
@@ -213,7 +213,7 @@ decompress(IgzipDecompressor *self, uint8_t *data, size_t len, Py_ssize_t max_le
             /* Discard buffer if it's too small
                (resizing it may needlessly copy the current contents) */
             if (self->input_buffer != NULL &&
-                self->input_buffer_size < self->avail_in_real) {
+                    self->input_buffer_size < self->avail_in_real) {
                 PyMem_Free(self->input_buffer);
                 self->input_buffer = NULL;
             }
@@ -572,9 +572,7 @@ static struct PyModuleDef igzip_lib_module = {
 PyMODINIT_FUNC
 PyInit_igzip_lib(void)
 {
-    PyObject *m;
-
-    m = PyModule_Create(&igzip_lib_module);
+    PyObject *m = PyModule_Create(&igzip_lib_module);
     if (m == NULL)
         return NULL;
 

src/isal/isal_shared.h

@@ -84,7 +84,7 @@ static const uint32_t LEVEL_BUF_SIZES[24] = {
 };
 
 static inline int mem_level_to_bufsize(int compression_level, int mem_level,
-                                uint32_t * bufsize)
+                                uint32_t *bufsize)
 {
     if (compression_level < 0 || compression_level > 3 || 
         mem_level < MEM_LEVEL_DEFAULT || mem_level > MEM_LEVEL_EXTRA_LARGE) {
@@ -96,7 +96,7 @@ static inline int mem_level_to_bufsize(int compression_level, int mem_level,
 
 static void isal_deflate_error(int err)
 {
-    const char * msg = NULL;
+    const char *msg = NULL;
     switch (err) {
         case COMP_OK: return;
         case INVALID_FLUSH:
@@ -127,7 +127,7 @@ static void isal_deflate_error(int err)
 }
 
 static void isal_inflate_error(int err){
-    const char * msg = NULL;
+    const char *msg = NULL;
     switch (err){
         case ISAL_DECOMP_OK:
             return;
@@ -199,8 +199,8 @@ static int bitbuffer_copy(struct inflate_state *state, char *to, size_t n){
     int remainder = bits_in_buffer % 8;
     // Shift the 8-byte bitbuffer read_in so that the bytes are aligned.
     uint64_t remaining_bytes = state->read_in >> remainder;
-    char * remaining_bytes_ptr = (char *)(&remaining_bytes);
-    memcpy(to, remaining_bytes_ptr, n);
+    // memcpy works because of little-endianness
+    memcpy(to, &remaining_bytes, n);
     return 0;
 }
 

src/isal/isal_zlibmodule.c

@@ -119,8 +119,11 @@ static const int ZLIB_MEM_LEVEL_TO_ISAL[10] = {
 
 static inline int zlib_mem_level_to_isal(int mem_level) {
     if (mem_level < 1 || mem_level > 9) {
-        PyErr_Format(PyExc_ValueError, 
-        "Invalid mem level: %d. Mem level should be between 1 and 9");
+        PyErr_Format(
+            PyExc_ValueError, 
+            "Invalid mem level: %d. Mem level should be between 1 and 9", 
+            mem_level
+        );
         return -1;}
     return ZLIB_MEM_LEVEL_TO_ISAL[mem_level];
 }
@@ -614,7 +617,7 @@ save_unconsumed_input(decompobject *self, Py_buffer *data, int err)
             new_data = PyBytes_FromStringAndSize(NULL, new_size);
             if (new_data == NULL)
                 return -1;
-            char * new_data_ptr = PyBytes_AS_STRING(new_data);
+            char *new_data_ptr = PyBytes_AS_STRING(new_data);
             memcpy(new_data_ptr,
                    PyBytes_AS_STRING(self->unused_data), old_size);
             bitbuffer_copy(&(self->zst), new_data_ptr + old_size, bytes_in_bitbuffer);
@@ -1194,9 +1197,7 @@ static struct PyModuleDef isal_zlib_module = {
 PyMODINIT_FUNC
 PyInit_isal_zlib(void)
 {
-    PyObject *m;
-
-    m = PyModule_Create(&isal_zlib_module);
+    PyObject *m = PyModule_Create(&isal_zlib_module);
     if (m == NULL) {
         return NULL;
     }