Be consistent with CPython on const usage

python · emmatyping · Apr 26, 2025 · Apr 26, 2025 · Apr 26, 2025 · Apr 26, 2025
commit 0962bbb0dc04bcd23fef42fe26db1672a976446d
diff --git a/Modules/_zstd/_zstdmodule.c b/Modules/_zstd/_zstdmodule.c
@@ -20,7 +20,7 @@ module _zstd
 /* Format error message and set ZstdError. */
 void
 set_zstd_error(const _zstd_state* const state,
-               const error_type type, const size_t zstd_ret)
+               error_type type, size_t zstd_ret)
 {
     char *msg;
     assert(ZSTD_isError(zstd_ret));
@@ -610,7 +610,7 @@ add_parameters(PyObject *module)
 static inline PyObject *
 get_zstd_version_info(void)
 {
-    const uint32_t ver = ZSTD_versionNumber();
+    uint32_t ver = ZSTD_versionNumber();
     uint32_t major, minor, release;
 
     major = ver / 10000;
@@ -723,7 +723,7 @@ add_type_to_module(PyObject *module, const char *name,
 }
 
 static inline int
-add_constant_to_type(PyTypeObject *type, const char *name, const long value)
+add_constant_to_type(PyTypeObject *type, const char *name, long value)
 {
     PyObject *temp;
 

diff --git a/Modules/_zstd/_zstdmodule.h b/Modules/_zstd/_zstdmodule.h
@@ -171,7 +171,7 @@ mt_continue_should_break(ZSTD_inBuffer *in, ZSTD_outBuffer *out) {
 /* Format error message and set ZstdError. */
 extern void
 set_zstd_error(const _zstd_state* const state,
-               const error_type type, const size_t zstd_ret);
+               const error_type type, size_t zstd_ret);
 
 extern void
 set_parameter_error(const _zstd_state* const state, int is_compress,
@@ -194,10 +194,10 @@ _PyZstd_set_d_parameters(ZstdDecompressor *self, PyObject *options);
 
 extern PyObject *
 decompress_impl(ZstdDecompressor *self, ZSTD_inBuffer *in,
-                const Py_ssize_t max_length,
-                const Py_ssize_t initial_size,
-                const decompress_type type);
+                Py_ssize_t max_length,
+                Py_ssize_t initial_size,
+                decompress_type type);
 
 extern PyObject *
 compress_impl(ZstdCompressor *self, Py_buffer *data,
-                const ZSTD_EndDirective end_directive);
+              ZSTD_EndDirective end_directive);
diff --git a/Modules/_zstd/buffer.h b/Modules/_zstd/buffer.h
@@ -13,7 +13,7 @@ Python module.
    Return -1 on failure */
 static inline int
 _OutputBuffer_InitAndGrow(_BlocksOutputBuffer *buffer, ZSTD_outBuffer *ob,
-                        const Py_ssize_t max_length)
+                        Py_ssize_t max_length)
 {
     /* Ensure .list was set to NULL */
     assert(buffer->list == NULL);
@@ -33,8 +33,8 @@ _OutputBuffer_InitAndGrow(_BlocksOutputBuffer *buffer, ZSTD_outBuffer *ob,
     Return -1 on failure */
 static inline int
 _OutputBuffer_InitWithSize(_BlocksOutputBuffer *buffer, ZSTD_outBuffer *ob,
-                            const Py_ssize_t max_length,
-                            const Py_ssize_t init_size)
+                            Py_ssize_t max_length,
+                            Py_ssize_t init_size)
 {
     Py_ssize_t block_size;
 

diff --git a/Modules/_zstd/compressor.c b/Modules/_zstd/compressor.c
@@ -37,7 +37,7 @@ _PyZstd_set_c_parameters(ZstdCompressor *self, PyObject *level_or_options,
 
     /* Integer compression level */
     if (PyLong_Check(level_or_options)) {
-        const int level = PyLong_AsInt(level_or_options);
+        int level = PyLong_AsInt(level_or_options);
         if (level == -1 && PyErr_Occurred()) {
             PyErr_Format(PyExc_ValueError,
                             "Compression level should be an int value between %d and %d.",
@@ -75,7 +75,7 @@ _PyZstd_set_c_parameters(ZstdCompressor *self, PyObject *level_or_options,
                 return -1;
             }
 
-            const int key_v = PyLong_AsInt(key);
+            int key_v = PyLong_AsInt(key);
             if (key_v == -1 && PyErr_Occurred()) {
                 PyErr_SetString(PyExc_ValueError,
                                 "Key of options dict should be a CParameter attribute.");
@@ -84,7 +84,7 @@ _PyZstd_set_c_parameters(ZstdCompressor *self, PyObject *level_or_options,
 
             // TODO(emmatyping): check bounds when there is a value error here for better
             // error message?
-            const int value_v = PyLong_AsInt(value);
+            int value_v = PyLong_AsInt(value);
             if (value_v == -1 && PyErr_Occurred()) {
                 PyErr_SetString(PyExc_ValueError,
                                 "Value of option dict should be an int.");
@@ -399,7 +399,7 @@ _zstd_ZstdCompressor___init___impl(ZstdCompressor *self, PyObject *level,
 
 PyObject *
 compress_impl(ZstdCompressor *self, Py_buffer *data,
-                const ZSTD_EndDirective end_directive)
+              ZSTD_EndDirective end_directive)
 {
     ZSTD_inBuffer in;
     ZSTD_outBuffer out;

diff --git a/Modules/_zstd/decompressor.c b/Modules/_zstd/decompressor.c
@@ -87,7 +87,7 @@ _PyZstd_set_d_parameters(ZstdDecompressor *self, PyObject *options)
         }
 
         /* Both key & value should be 32-bit signed int */
-        const int key_v = PyLong_AsInt(key);
+        int key_v = PyLong_AsInt(key);
         if (key_v == -1 && PyErr_Occurred()) {
             PyErr_SetString(PyExc_ValueError,
                             "Key of options dict should be a DParameter attribute.");
@@ -96,7 +96,7 @@ _PyZstd_set_d_parameters(ZstdDecompressor *self, PyObject *options)
 
         // TODO(emmatyping): check bounds when there is a value error here for better
         // error message?
-        const int value_v = PyLong_AsInt(value);
+        int value_v = PyLong_AsInt(value);
         if (value_v == -1 && PyErr_Occurred()) {
             PyErr_SetString(PyExc_ValueError,
                             "Value of options dict should be an int.");
@@ -269,9 +269,9 @@ _PyZstd_load_d_dict(ZstdDecompressor *self, PyObject *dict)
 */
 PyObject *
 decompress_impl(ZstdDecompressor *self, ZSTD_inBuffer *in,
-                const Py_ssize_t max_length,
-                const Py_ssize_t initial_size,
-                const decompress_type type)
+                Py_ssize_t max_length,
+                Py_ssize_t initial_size,
+                decompress_type type)
 {
     size_t zstd_ret;
     ZSTD_outBuffer out;
@@ -370,7 +370,7 @@ decompress_impl(ZstdDecompressor *self, ZSTD_inBuffer *in,
 
 void
 decompressor_reset_session(ZstdDecompressor *self,
-                           const decompress_type type)
+                           decompress_type type)
 {
     /* Reset variables */
     self->in_begin = 0;
@@ -392,7 +392,7 @@ decompressor_reset_session(ZstdDecompressor *self,
 
 PyObject *
 stream_decompress(ZstdDecompressor *self, Py_buffer *data, Py_ssize_t max_length,
-                  const decompress_type type)
+                  decompress_type type)
 {
     Py_ssize_t initial_buffer_size = -1;
     ZSTD_inBuffer in;
@@ -449,21 +449,21 @@ stream_decompress(ZstdDecompressor *self, Py_buffer *data, Py_ssize_t max_length
         use_input_buffer = 1;
 
         /* Unconsumed data size in input_buffer */
-        const size_t used_now = self->in_end - self->in_begin;
+        size_t used_now = self->in_end - self->in_begin;
         assert(self->in_end > self->in_begin);
 
         /* Number of bytes we can append to input buffer */
-        const size_t avail_now = self->input_buffer_size - self->in_end;
+        size_t avail_now = self->input_buffer_size - self->in_end;
         assert(self->input_buffer_size >= self->in_end);
 
         /* Number of bytes we can append if we move existing contents to
            beginning of buffer */
-        const size_t avail_total = self->input_buffer_size - used_now;
+        size_t avail_total = self->input_buffer_size - used_now;
         assert(self->input_buffer_size >= used_now);
 
         if (avail_total < (size_t) data->len) {
             char *tmp;
-            const size_t new_size = used_now + data->len;
+            size_t new_size = used_now + data->len;
 
             /* Allocate with new size */
             tmp = PyMem_Malloc(new_size);
@@ -537,7 +537,7 @@ stream_decompress(ZstdDecompressor *self, Py_buffer *data, Py_ssize_t max_length
             self->in_end = 0;
         }
     } else {
-        const size_t data_size = in.size - in.pos;
+        size_t data_size = in.size - in.pos;
 
         self->needs_input = 0;