Address line length in C files

rhpvorderman · rhpvorderman · commit a46faa4d988b · 2022-09-27T09:48:26.000+02:00
diff --git a/src/isal/_isalmodule.c b/src/isal/_isalmodule.c
@@ -5,8 +5,9 @@
 // This file is part of python-isal which is distributed under the 
 // PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2.
 
-// This file is not originally from the CPython distribution. But it does contain mostly example code
-// from the Python docs. Also dual licensing just for this one file seemed silly.
+// This file is not originally from the CPython distribution. But it does 
+// contain mostly example code from the Python docs. Also dual licensing just 
+// for this one file seemed silly.
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
diff --git a/src/isal/igzip_libmodule.c b/src/isal/igzip_libmodule.c
@@ -102,8 +102,10 @@ decompress_buf(IgzipDecompressor *self, Py_ssize_t max_length)
                 isal_inflate_error(err);
                 goto error;
             }
-        } while (self->state.avail_out == 0 && self->state.block_state != ISAL_BLOCK_FINISH);
-    } while(self->avail_in_real != 0 && self->state.block_state != ISAL_BLOCK_FINISH);
+        } while (self->state.avail_out == 0 && 
+                 self->state.block_state != ISAL_BLOCK_FINISH);
+    } while(self->avail_in_real != 0 && 
+            self->state.block_state != ISAL_BLOCK_FINISH);
 
     if (self->state.block_state == ISAL_BLOCK_FINISH)
         self->eof = 1;
@@ -189,7 +191,8 @@ decompress(IgzipDecompressor *self, uint8_t *data, size_t len, Py_ssize_t max_le
                 goto error;
             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);
+            memcpy(new_data_ptr + bytes_in_bitbuffer, self->state.next_in, 
+                   self->avail_in_real);
             Py_XSETREF(self->unused_data, new_data);
         }
     }
@@ -257,7 +260,8 @@ PyDoc_STRVAR(igzip_lib_compress__doc__,
 "    the header and trailer are controlled by the flag parameter.");
 
 #define IGZIP_LIB_COMPRESS_METHODDEF    \
-    {"compress", (PyCFunction)(void(*)(void))igzip_lib_compress, METH_VARARGS|METH_KEYWORDS, igzip_lib_compress__doc__}
+    {"compress", (PyCFunction)(void(*)(void))igzip_lib_compress, \
+     METH_VARARGS|METH_KEYWORDS, igzip_lib_compress__doc__}
 
 static PyObject *
 igzip_lib_compress(PyObject *module, PyObject *args, PyObject *kwargs)
@@ -298,7 +302,8 @@ PyDoc_STRVAR(igzip_lib_decompress__doc__,
 "    The initial output buffer size.");
 
 #define IGZIP_LIB_DECOMPRESS_METHODDEF    \
-    {"decompress", (PyCFunction)(void(*)(void))igzip_lib_decompress, METH_VARARGS|METH_KEYWORDS, igzip_lib_decompress__doc__}
+    {"decompress", (PyCFunction)(void(*)(void))igzip_lib_decompress, \
+     METH_VARARGS|METH_KEYWORDS, igzip_lib_decompress__doc__}
 
 static PyObject *
 igzip_lib_decompress(PyObject *module, PyObject *args, PyObject *kwargs)
@@ -340,10 +345,13 @@ PyDoc_STRVAR(igzip_lib_IgzipDecompressor_decompress__doc__,
 "the unused_data attribute.");
 
 #define IGZIP_LIB_IGZIPDECOMPRESSOR_DECOMPRESS_METHODDEF    \
-    {"decompress", (PyCFunction)(void(*)(void))igzip_lib_IgzipDecompressor_decompress, METH_VARARGS|METH_KEYWORDS, igzip_lib_IgzipDecompressor_decompress__doc__}
+    {"decompress", (PyCFunction)(void(*)(void))igzip_lib_IgzipDecompressor_decompress, \ 
+     METH_VARARGS|METH_KEYWORDS, igzip_lib_IgzipDecompressor_decompress__doc__}
 
 static PyObject *
-igzip_lib_IgzipDecompressor_decompress(IgzipDecompressor *self, PyObject *args, PyObject *kwargs)
+igzip_lib_IgzipDecompressor_decompress(IgzipDecompressor *self, 
+                                       PyObject *args, 
+                                       PyObject *kwargs)
 {
     static char *keywords[] = {"", "max_length", NULL};
     static char *format = "y*|n:decompress";
@@ -458,8 +466,9 @@ static PyMemberDef IgzipDecompressor_members[] = {
      READONLY, IgzipDecompressor_unused_data__doc__},
     {"needs_input", T_BOOL, offsetof(IgzipDecompressor, needs_input), READONLY,
      IgzipDecompressor_needs_input_doc},
-    {"crc", T_UINT, offsetof(IgzipDecompressor, state) + offsetof(struct inflate_state, crc), READONLY,
-     IgzipDecompressor_crc_doc},
+    {"crc", T_UINT, 
+     offsetof(IgzipDecompressor, state) + offsetof(struct inflate_state, crc), 
+     READONLY, IgzipDecompressor_crc_doc},
     {NULL}
 };
 
@@ -584,7 +593,8 @@ PyInit_igzip_lib(void)
         return NULL;
     }
     Py_INCREF(&IgzipDecompressor_Type);
-    if (PyModule_AddObject(m, "IgzipDecompressor",  (PyObject *)&IgzipDecompressor_Type) < 0) {
+    if (PyModule_AddObject(m, "IgzipDecompressor",  
+                           (PyObject *)&IgzipDecompressor_Type) < 0) {
         return NULL;
     }
 
diff --git a/src/isal/isal_shared.h b/src/isal/isal_shared.h
@@ -85,7 +85,8 @@ static const uint32_t LEVEL_BUF_SIZES[24] = {
 static inline int mem_level_to_bufsize(int compression_level, int mem_level,
                                 uint32_t * bufsize)
 {
-    if (compression_level < 0 || compression_level > 3 || mem_level < MEM_LEVEL_DEFAULT || mem_level > MEM_LEVEL_EXTRA_LARGE) {
+    if (compression_level < 0 || compression_level > 3 || 
+        mem_level < MEM_LEVEL_DEFAULT || mem_level > MEM_LEVEL_EXTRA_LARGE) {
         *bufsize = 0; return -1;
     }
     *bufsize = LEVEL_BUF_SIZES[compression_level * 6 + mem_level];
@@ -121,7 +122,8 @@ static void isal_inflate_error(int err){
     else if (err == ISAL_INVALID_SYMBOL) msg = "Invalid deflate symbol found";
     else if (err == ISAL_INVALID_LOOKBACK) msg = "Invalid lookback distance found";
     else if (err == ISAL_INVALID_WRAPPER) msg = "Invalid gzip/zlib wrapper found";
-    else if (err == ISAL_UNSUPPORTED_METHOD) msg = "Gzip/zlib wrapper specifies unsupported compress method";
+    else if (err == ISAL_UNSUPPORTED_METHOD) msg = "Gzip/zlib wrapper specifies" 
+                                                   "unsupported compress method";
     else if (err == ISAL_INCORRECT_CHECKSUM) msg = "Incorrect checksum found";
     else msg = "Unknown error";
 
@@ -268,7 +270,8 @@ igzip_lib_compress_impl(Py_buffer *data,
         else zst.flush = NO_FLUSH;
 
         do {
-            obuflen = arrange_output_buffer(&(zst.avail_out), &(zst.next_out), &RetVal, obuflen);
+            obuflen = arrange_output_buffer(&(zst.avail_out), &(zst.next_out), 
+                                            &RetVal, obuflen);
             if (obuflen < 0) {
                 PyErr_SetString(PyExc_MemoryError,
                         "Unsufficient memory for buffer allocation");
diff --git a/src/isal/isal_zlibmodule.c b/src/isal/isal_zlibmodule.c
@@ -109,7 +109,8 @@ static const int ZLIB_MEM_LEVEL_TO_ISAL[10] = {
     MEM_LEVEL_MEDIUM, // 4-6 -> MEDIUM
     MEM_LEVEL_MEDIUM, 
     MEM_LEVEL_MEDIUM,
-    MEM_LEVEL_LARGE, // 7-8 LARGE. The zlib module default = 8. Large is the ISA-L default value.
+    // 7-8 LARGE. The zlib module default = 8. Large is the ISA-L default value.
+    MEM_LEVEL_LARGE, 
     MEM_LEVEL_LARGE,
     MEM_LEVEL_EXTRA_LARGE, // 9 -> EXTRA_LARGE. 
 };
@@ -435,7 +436,8 @@ isal_zlib_compressobj_impl(PyObject *module, int level, int method, int wbits,
     if (strategy != Z_DEFAULT_STRATEGY){
         err = PyErr_WarnEx(
             PyExc_UserWarning, 
-            "Only one strategy is supported when using isal_zlib. Using the default strategy.",
+            "Only one strategy is supported when using isal_zlib. Using the "
+            "default strategy.",
             1);
         if (err == -1)
             // Warning was turned into an exception.
@@ -456,7 +458,8 @@ isal_zlib_compressobj_impl(PyObject *module, int level, int method, int wbits,
     if (mem_level_to_bufsize(
         level, isal_mem_level, &level_buf_size) == -1) {
         PyErr_Format(PyExc_ValueError, 
-                     "Invalid compression level: %d. Compression level should be between 0 and 3", 
+                     "Invalid compression level: %d. Compression level should "
+                     "be between 0 and 3", 
                      level);
         goto error;
     }   
@@ -690,7 +693,8 @@ isal_zlib_Decompress_decompress_impl(decompobject *self, Py_buffer *data,
                 goto abort;
             }
 
-        } while (self->zst.avail_out == 0 && self->zst.block_state != ISAL_BLOCK_FINISH);
+        } while (self->zst.avail_out == 0 && 
+                 self->zst.block_state != ISAL_BLOCK_FINISH);
 
     } while (self->zst.block_state != ISAL_BLOCK_FINISH && ibuflen != 0);
 
@@ -802,7 +806,8 @@ isal_zlib_Decompress_flush_impl(decompobject *self, Py_ssize_t length)
 
         do {
             length = arrange_output_buffer(&(self->zst.avail_out),
-                                           &(self->zst.next_out), &RetVal, length);
+                                           &(self->zst.next_out), 
+                                           &RetVal, length);
             if (length < 0)
                 goto abort;
 
@@ -813,7 +818,8 @@ isal_zlib_Decompress_flush_impl(decompobject *self, Py_ssize_t length)
                 goto abort;
             }
 
-        } while (self->zst.avail_out == 0 && self->zst.block_state != ISAL_BLOCK_FINISH);
+        } while (self->zst.avail_out == 0 && 
+                 self->zst.block_state != ISAL_BLOCK_FINISH);
 
     } while (self->zst.block_state != ISAL_BLOCK_FINISH && ibuflen != 0);
 
@@ -868,13 +874,15 @@ PyDoc_STRVAR(isal_zlib_compressobj__doc__,
 "    containing subsequences that are likely to occur in the input data.");
 
 #define ISAL_ZLIB_COMPRESSOBJ_METHODDEF    \
-    {"compressobj", (PyCFunction)(void(*)(void))isal_zlib_compressobj, METH_VARARGS|METH_KEYWORDS, isal_zlib_compressobj__doc__}
+    {"compressobj", (PyCFunction)(void(*)(void))isal_zlib_compressobj, \
+     METH_VARARGS|METH_KEYWORDS, isal_zlib_compressobj__doc__}
 
 static PyObject *
 isal_zlib_compressobj(PyObject *module, PyObject *args, PyObject *kwargs)
 {
     PyObject *return_value = NULL;
-    static char *keywords[] = {"level", "method", "wbits", "memLevel", "strategy", "zdict", NULL};
+    static char *keywords[] = {"level", "method", "wbits", "memLevel", 
+                               "strategy", "zdict", NULL};
     static char *format = "|iiiiiy*:compressobj";
     int level = ISAL_DEFAULT_COMPRESSION;
     int method = Z_DEFLATED;
@@ -888,7 +896,8 @@ isal_zlib_compressobj(PyObject *module, PyObject *args, PyObject *kwargs)
             &level, &method, &wbits, &memLevel, &strategy, &zdict)) {
         return NULL;
     }
-    return_value = isal_zlib_compressobj_impl(module, level, method, wbits, memLevel, strategy, &zdict);
+    return_value = isal_zlib_compressobj_impl(module, level, method, wbits, 
+                                              memLevel, strategy, &zdict);
     PyBuffer_Release(&zdict);
     return return_value;
 }
@@ -906,7 +915,8 @@ PyDoc_STRVAR(isal_zlib_decompressobj__doc__,
 "    dictionary as used by the compressor that produced the input data.");
 
 #define ISAL_ZLIB_DECOMPRESSOBJ_METHODDEF    \
-    {"decompressobj", (PyCFunction)(void(*)(void))isal_zlib_decompressobj, METH_VARARGS|METH_KEYWORDS, isal_zlib_decompressobj__doc__}
+    {"decompressobj", (PyCFunction)(void(*)(void))isal_zlib_decompressobj, \
+     METH_VARARGS|METH_KEYWORDS, isal_zlib_decompressobj__doc__}
 
 static PyObject *
 isal_zlib_decompressobj(PyObject *module, PyObject *args, PyObject *kwargs)
@@ -938,7 +948,8 @@ PyDoc_STRVAR(isal_zlib_Compress_compress__doc__,
 "Call the flush() method to clear these buffers.");
 
 #define ISAL_ZLIB_COMPRESS_COMPRESS_METHODDEF    \
-    {"compress", (PyCFunction)(void(*)(void))isal_zlib_Compress_compress, METH_O, isal_zlib_Compress_compress__doc__}
+    {"compress", (PyCFunction)(void(*)(void))isal_zlib_Compress_compress, \
+     METH_O, isal_zlib_Compress_compress__doc__}
 
 
 static PyObject *
@@ -971,7 +982,8 @@ PyDoc_STRVAR(isal_zlib_Decompress_decompress__doc__,
 "Call the flush() method to clear these buffers.");
 
 #define ISAL_ZLIB_DECOMPRESS_DECOMPRESS_METHODDEF    \
-    {"decompress", (PyCFunction)(void(*)(void))isal_zlib_Decompress_decompress, METH_VARARGS|METH_KEYWORDS, isal_zlib_Decompress_decompress__doc__}
+    {"decompress", (PyCFunction)(void(*)(void))isal_zlib_Decompress_decompress, \
+     METH_VARARGS|METH_KEYWORDS, isal_zlib_Decompress_decompress__doc__}
 
 
 static PyObject *
@@ -986,7 +998,8 @@ isal_zlib_Decompress_decompress(decompobject *self, PyObject *args, PyObject *kw
             args, kwargs, format, keywords, &data, &max_length)) {
         return NULL;
     }
-    PyObject *return_value = isal_zlib_Decompress_decompress_impl(self, &data, max_length);
+    PyObject *return_value = isal_zlib_Decompress_decompress_impl(self, &data, 
+                                                                  max_length);
     PyBuffer_Release(&data);
     return return_value;
 }
@@ -1004,11 +1017,15 @@ PyDoc_STRVAR(isal_zlib_Compress_flush__doc__,
 "    can still be compressed.");
 
 #define ISAL_ZLIB_COMPRESS_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)(void(*)(void))isal_zlib_Compress_flush, METH_FASTCALL|METH_KEYWORDS, isal_zlib_Compress_flush__doc__}
+    {"flush", (PyCFunction)(void(*)(void))isal_zlib_Compress_flush, \
+     METH_FASTCALL|METH_KEYWORDS, isal_zlib_Compress_flush__doc__}
 
 
 static PyObject *
-isal_zlib_Compress_flush(compobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+isal_zlib_Compress_flush(compobject *self, 
+                         PyObject *const *args, 
+                         Py_ssize_t nargs, 
+                         PyObject *kwnames)
 {
     Py_ssize_t mode; 
     if (nargs == 0) {
@@ -1047,7 +1064,8 @@ PyDoc_STRVAR(isal_zlib_Decompress_flush__doc__,
 
 
 #define ISAL_ZLIB_DECOMPRESS_FLUSH_METHODDEF    \
-    {"flush", (PyCFunction)(void(*)(void))isal_zlib_Decompress_flush, METH_FASTCALL, isal_zlib_Decompress_flush__doc__}
+    {"flush", (PyCFunction)(void(*)(void))isal_zlib_Decompress_flush, \
+     METH_FASTCALL, isal_zlib_Decompress_flush__doc__}
 
 static PyObject *
 isal_zlib_Decompress_flush(decompobject *self, PyObject *const *args, Py_ssize_t nargs)
