Fix compiler errors and warnings. Polish the code.

python · serhiy-storchaka · Jul 25, 2023 · Jul 18, 2023 · Jul 18, 2023 · Jul 25, 2023
commit cdd8908130e5f63095b744d40e7dfdd223ba7a99
diff --git a/Modules/_testcapi/heaptype.c b/Modules/_testcapi/heaptype.c
@@ -1174,15 +1174,9 @@ _PyTestCapi_Init_Heaptype(PyObject *m) {
    ADD("HeapCTypeWithWeakref2", HeapCTypeWithWeakref2);

    PyObject *HeapCTypeWithBuffer = PyType_FromSpec(&HeapCTypeWithBuffer_spec);
-    if (HeapCTypeWithBuffer == NULL) {
-        return -1;
-    }
    ADD("HeapCTypeWithBuffer", HeapCTypeWithBuffer);

    PyObject *HeapCTypeSetattr = PyType_FromSpec(&HeapCTypeSetattr_spec);
-    if (HeapCTypeSetattr == NULL) {
-        return -1;
-    }
    ADD("HeapCTypeSetattr", HeapCTypeSetattr);

    PyObject *subclass_with_finalizer_bases = PyTuple_Pack(1, HeapCTypeSubclass);

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -3197,7 +3197,7 @@ static struct PyModuleDef _tkintermodule = {
 PyMODINIT_FUNC
 PyInit__tkinter(void)
 {
-  PyObject *m, *uexe, *cexe, *o;
+    PyObject *m, *uexe, *cexe;

    tcl_lock = PyThread_allocate_lock();
    if (tcl_lock == NULL)

diff --git a/Modules/binascii.c b/Modules/binascii.c
@@ -1253,8 +1253,8 @@ static struct PyMethodDef binascii_module_methods[] = {
 PyDoc_STRVAR(doc_binascii, "Conversion between binary data and ASCII");

 static int
-binascii_exec(PyObject *module) {
-    int result;
+binascii_exec(PyObject *module)
+{
    binascii_state *state = PyModule_GetState(module);
    if (state == NULL) {
        return -1;

diff --git a/Modules/xxlimited_35.c b/Modules/xxlimited_35.c
@@ -235,6 +235,8 @@ PyDoc_STRVAR(module_doc,
 static int
 xx_modexec(PyObject *m)
 {
+    PyObject *o;
+
    /* Due to cross platform compiler issues the slots must be filled
     * here. It's required for portability to Windows without requiring
     * C++. */
@@ -245,24 +247,43 @@ xx_modexec(PyObject *m)
    /* Add some symbolic constants to the module */
    if (ErrorObject == NULL) {
        ErrorObject = PyErr_NewException("xxlimited_35.error", NULL, NULL);
+        if (ErrorObject == NULL) {
+            return -1;
+        }
    }
-    if (PyModule_AddObjectRef(m, "error", ErrorObject) < 0) {
+    Py_INCREF(ErrorObject);
+    if (PyModule_AddObject(m, "error", ErrorObject) < 0) {
+        Py_DECREF(ErrorObject);
        return -1;
    }

    /* Add Xxo */
    Xxo_Type = PyType_FromSpec(&Xxo_Type_spec);
-    if (PyModule_Add(m, "Xxo", Xxo_Type) < 0) {
+    if (Xxo_Type == NULL) {
+        return -1;
+    }
+    if (PyModule_AddObject(m, "Xxo", Xxo_Type) < 0) {
+        Py_DECREF(Xxo_Type);
        return -1;
    }

    /* Add Str */
-    if (PyModule_Add(m, "Str", PyType_FromSpec(&Str_Type_spec)) < 0) {
+    o = PyType_FromSpec(&Str_Type_spec);
+    if (o == NULL) {
+        return -1;
+    }
+    if (PyModule_AddObject(m, "Str", o) < 0) {
+        Py_DECREF(o);
        return -1;
    }

    /* Add Null */
-    if (PyModule_Add(m, "Null", PyType_FromSpec(&Null_Type_spec)) < 0) {
+    o = PyType_FromSpec(&Null_Type_spec);
+    if (o == NULL) {
+        return -1;
+    }
+    if (PyModule_AddObject(m, "Null", o) < 0) {
+        Py_DECREF(o);
        return -1;
    }


diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
@@ -2034,7 +2034,7 @@ zlib_exec(PyObject *mod)
        return -1;
    }
    if (PyModule_AddObjectRef(mod, "_ZlibDecompressor",
-                           state->ZlibDecompressorType) < 0) {
+                              (PyObject *)state->ZlibDecompressorType) < 0) {
        return -1;
    }

@@ -2076,10 +2076,12 @@ zlib_exec(PyObject *mod)
 #ifdef Z_TREES // 1.2.3.4, only for inflate
    ZLIB_ADD_INT_MACRO(Z_TREES);
 #endif
-    if (PyModule_Add(mod, "ZLIB_VERSION", PyUnicode_FromString(ZLIB_VERSION)) < 0) {
+    if (PyModule_Add(mod, "ZLIB_VERSION",
+                     PyUnicode_FromString(ZLIB_VERSION)) < 0) {
        return -1;
    }
-    if (PyModule_Add(mod, "ZLIB_RUNTIME_VERSION", PyUnicode_FromString(zlibVersion())) < 0) {
+    if (PyModule_Add(mod, "ZLIB_RUNTIME_VERSION",
+                     PyUnicode_FromString(zlibVersion())) < 0) {
        return -1;
    }
    if (PyModule_AddStringConstant(mod, "__version__", "1.0") < 0) {