Rename inited to initialized, convert to bool

Author: AA-Turner

Modules/_zstd/_zstdmodule.h

@@ -11,6 +11,8 @@ Python module.
 #include "zstd.h"
 #include "zdict.h"
 
+#include <stdbool.h>              // bool
+
 
 /* Forward declaration of module state */
 typedef struct _zstd_state _zstd_state;
@@ -61,7 +63,7 @@ typedef struct {
     uint32_t dict_id;
 
     /* __init__ has been called, 0 or 1. */
-    int inited;
+    bool initialized;
 } ZstdDict;
 
 typedef struct {
@@ -83,7 +85,7 @@ typedef struct {
     int compression_level;
 
     /* __init__ has been called, 0 or 1. */
-    int inited;
+    bool initialized;
 } ZstdCompressor;
 
 typedef struct {
@@ -120,7 +122,7 @@ typedef struct {
     char _unused_char_for_align;
 
     /* __init__ has been called, 0 or 1. */
-    int inited;
+    bool initialized;
 } ZstdDecompressor;
 
 typedef enum {
@@ -163,5 +165,3 @@ set_zstd_error(const _zstd_state* const state,
 extern void
 set_parameter_error(const _zstd_state* const state, int is_compress,
                     int key_v, int value_v);
-
-static const char init_twice_msg[] = "__init__ method is called twice.";

Modules/_zstd/compressor.c

@@ -20,6 +20,7 @@ class _zstd.ZstdCompressor "ZstdCompressor *" "clinic_state()->ZstdCompressor_ty
 
 #include "buffer.h"
 
+#include <stdbool.h>              // bool
 #include <stddef.h>               // offsetof()
 
 
@@ -305,7 +306,7 @@ _zstd_ZstdCompressor_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject
         goto error;
     }
 
-    self->inited = 0;
+    self->initialized = 0;
     self->dict = NULL;
     self->use_multithread = 0;
 
@@ -372,12 +373,11 @@ _zstd_ZstdCompressor___init___impl(ZstdCompressor *self, PyObject *level,
                                    PyObject *options, PyObject *zstd_dict)
 /*[clinic end generated code: output=215e6c4342732f96 input=9f79b0d8d34c8ef0]*/
 {
-    /* Only called once */
-    if (self->inited) {
-        PyErr_SetString(PyExc_RuntimeError, init_twice_msg);
+    if (self->initialized) {
+        PyErr_SetString(PyExc_RuntimeError, "reinitialization not supported");
         return -1;
     }
-    self->inited = 1;
+    self->initialized = 1;
 
     if (level != Py_None && options != Py_None) {
         PyErr_SetString(PyExc_RuntimeError, "Only one of level or options should be used.");

Modules/_zstd/decompressor.c

@@ -19,6 +19,7 @@ class _zstd.ZstdDecompressor "ZstdDecompressor *" "clinic_state()->ZstdDecompres
 
 #include "buffer.h"
 
+#include <stdbool.h>              // bool
 #include <stddef.h>               // offsetof()
 
 #define ZstdDecompressor_CAST(op) ((ZstdDecompressor *)op)
@@ -616,7 +617,7 @@ _zstd_ZstdDecompressor_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         goto error;
     }
 
-    self->inited = 0;
+    self->initialized = 0;
     self->dict = NULL;
     self->input_buffer = NULL;
     self->input_buffer_size = 0;
@@ -695,11 +696,11 @@ _zstd_ZstdDecompressor___init___impl(ZstdDecompressor *self,
 /*[clinic end generated code: output=703af2f1ec226642 input=8fd72999acc1a146]*/
 {
     /* Only called once */
-    if (self->inited) {
-        PyErr_SetString(PyExc_RuntimeError, init_twice_msg);
+    if (self->initialized) {
+        PyErr_SetString(PyExc_RuntimeError, "reinitialization not supported");
         return -1;
     }
-    self->inited = 1;
+    self->initialized = 1;
 
     /* Load dictionary to decompression context */
     if (zstd_dict != Py_None) {

Modules/_zstd/zstddict.c

@@ -17,6 +17,7 @@ class _zstd.ZstdDict "ZstdDict *" "clinic_state()->ZstdDict_type"
 
 #include "_zstdmodule.h"
 
+#include <stdbool.h>              // bool
 #include <stddef.h>               // offsetof()
 
 #define ZstdDict_CAST(op) ((ZstdDict *)op)
@@ -31,7 +32,7 @@ _zstd_ZstdDict_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_U
     }
 
     self->dict_content = NULL;
-    self->inited = 0;
+    self->initialized = 0;
     self->d_dict = NULL;
 
     /* ZSTD_CDict dict */
@@ -92,11 +93,11 @@ _zstd_ZstdDict___init___impl(ZstdDict *self, PyObject *dict_content,
 /*[clinic end generated code: output=c5f5a0d8377d037c input=e6750f62a513b3ee]*/
 {
     /* Only called once */
-    if (self->inited) {
-        PyErr_SetString(PyExc_RuntimeError, init_twice_msg);
+    if (self->initialized) {
+        PyErr_SetString(PyExc_RuntimeError, "reinitialization not supported");
         return -1;
     }
-    self->inited = 1;
+    self->initialized = 1;
 
     /* Check dict_content's type */
     self->dict_content = PyBytes_FromObject(dict_content);