Replace AddObject with AddObjectRef

MightyJosip · MightyJosip · commit 1a34396d97fe · 2025-04-26T11:09:12.000+02:00
diff --git a/src_c/_freetype.c b/src_c/_freetype.c
@@ -2415,7 +2415,8 @@ MODINIT_DEFINE(_freetype)
     c_api[1] = &pgFont_New;
 
     apiobj = encapsulate_api(c_api, "freetype");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/base.c b/src_c/base.c
@@ -2396,7 +2396,8 @@ MODINIT_DEFINE(base)
     /* create the exceptions */
     pgExc_SDLError =
         PyErr_NewException("pygame.error", PyExc_RuntimeError, NULL);
-    if (PyModule_AddObjectRef(module, "error", pgExc_SDLError)) {
+    if (PyModule_AddObject(module, "error", pgExc_SDLError)) {
+        Py_XDECREF(pgExc_SDLError);
         goto error;
     }
 
@@ -2446,7 +2447,8 @@ MODINIT_DEFINE(base)
 #endif
 
     apiobj = encapsulate_api(c_api, "base");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         goto error;
     }
 
@@ -2460,7 +2462,8 @@ MODINIT_DEFINE(base)
     if (!version) {
         goto error;
     }
-    if (PyModule_AddObjectRef(module, "__version__", version)) {
+    if (PyModule_AddObject(module, "__version__", version)) {
+        Py_DECREF(version);
         goto error;
     }
 
diff --git a/src_c/bufferproxy.c b/src_c/bufferproxy.c
@@ -617,7 +617,8 @@ MODINIT_DEFINE(bufferproxy)
     c_api[2] = pgBufferProxy_GetParent;
     c_api[3] = pgBufferProxy_Trip;
     apiobj = encapsulate_api(c_api, "bufferproxy");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/color.c b/src_c/color.c
@@ -2499,7 +2499,8 @@ MODINIT_DEFINE(color)
     c_api[4] = pg_MappedColorFromObj;
 
     apiobj = encapsulate_api(c_api, "color");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         goto error;
     }
     return module;
diff --git a/src_c/constants.c b/src_c/constants.c
@@ -648,7 +648,8 @@ MODINIT_DEFINE(constants)
     DEC_CONSTS(FLASH_UNTIL_FOCUSED, -1);
 #endif
 
-    if (PyModule_AddObjectRef(module, "__all__", all_list)) {
+    if (PyModule_AddObject(module, "__all__", all_list)) {
+        Py_DECREF(all_list);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/event.c b/src_c/event.c
@@ -2602,7 +2602,8 @@ MODINIT_DEFINE(event)
     c_api[9] = pgEvent_GetMouseButtonUpInfo;
 
     apiobj = encapsulate_api(c_api, "event");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/font.c b/src_c/font.c
@@ -1445,7 +1445,8 @@ MODINIT_DEFINE(font)
     c_api[1] = PyFont_New;
     c_api[2] = &font_initialized;
     apiobj = encapsulate_api(c_api, "font");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/geometry.c b/src_c/geometry.c
@@ -53,7 +53,8 @@ MODINIT_DEFINE(geometry)
     c_api[0] = &pgCircle_Type;
     c_api[1] = &pgLine_Type;
     apiobj = encapsulate_api(c_api, "geometry");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/joystick.c b/src_c/joystick.c
@@ -687,7 +687,8 @@ MODINIT_DEFINE(joystick)
     c_api[1] = pgJoystick_New;
     c_api[2] = pgJoystick_GetDeviceIndexByInstanceID;
     apiobj = encapsulate_api(c_api, "joystick");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/mask.c b/src_c/mask.c
@@ -2662,7 +2662,8 @@ MODINIT_DEFINE(mask)
     /* export the c api */
     c_api[0] = &pgMask_Type;
     apiobj = encapsulate_api(c_api, "mask");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/math.c b/src_c/math.c
@@ -4594,7 +4594,8 @@ MODINIT_DEFINE(math)
     c_api[3] = pgVectorCompatible_Check;
     */
     apiobj = encapsulate_api(c_api, "math");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/mixer.c b/src_c/mixer.c
@@ -2127,14 +2127,16 @@ MODINIT_DEFINE(mixer)
     c_api[3] = &pgChannel_Type;
     c_api[4] = pgChannel_New;
     apiobj = encapsulate_api(c_api, "mixer");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
 
     music = import_music();
     if (music) {
-        if (PyModule_AddObjectRef(module, "music", music)) {
+        if (PyModule_AddObject(module, "music", music)) {
+            Py_DECREF(music);
             Py_DECREF(module);
             return NULL;
         }
diff --git a/src_c/music.c b/src_c/music.c
@@ -628,13 +628,15 @@ MODINIT_DEFINE(mixer_music)
     }
     cobj = PyCapsule_New(&current_music, "pygame.music_mixer._MUSIC_POINTER",
                          NULL);
-    if (PyModule_AddObjectRef(module, "_MUSIC_POINTER", cobj)) {
+    if (PyModule_AddObject(module, "_MUSIC_POINTER", cobj)) {
+        Py_XDECREF(cobj);
         Py_DECREF(module);
         return NULL;
     }
     cobj =
         PyCapsule_New(&queue_music, "pygame.music_mixer._QUEUE_POINTER", NULL);
-    if (PyModule_AddObjectRef(module, "_QUEUE_POINTER", cobj)) {
+    if (PyModule_AddObject(module, "_QUEUE_POINTER", cobj)) {
+        Py_XDECREF(cobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/newbuffer.c b/src_c/newbuffer.c
@@ -68,7 +68,8 @@ Module_AddSsize_tConstant(PyObject *module, const char *name, Py_ssize_t value)
     if (!py_value) {
         return -1;
     }
-    if (PyModule_AddObjectRef(module, name, py_value)) {
+    if (PyModule_AddObject(module, name, py_value)) {
+        Py_DECREF(py_value);
         return -1;
     }
     return 0;
diff --git a/src_c/pixelarray.c b/src_c/pixelarray.c
@@ -1946,7 +1946,8 @@ MODINIT_DEFINE(pixelarray)
     c_api[0] = &pgPixelArray_Type;
     c_api[1] = pgPixelArray_New;
     apiobj = encapsulate_api(c_api, "pixelarray");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/rect.c b/src_c/rect.c
@@ -831,7 +831,8 @@ MODINIT_DEFINE(rect)
     c_api[8] = pgFRect_FromObject;
     c_api[9] = pgFRect_Normalize;
     apiobj = encapsulate_api(c_api, "rect");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/render.c b/src_c/render.c
@@ -112,7 +112,8 @@ MODINIT_DEFINE(_render)
     c_api[1] = &pgTexture_Type;
     c_api[2] = &pgImage_Type;
     apiobj = encapsulate_api(c_api, "_render");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/rwobject.c b/src_c/rwobject.c
@@ -874,7 +874,8 @@ MODINIT_DEFINE(rwobject)
     c_api[3] = pg_EncodeString;
     c_api[4] = pgRWops_FromFileObject;
     apiobj = encapsulate_api(c_api, "rwobject");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/surface.c b/src_c/surface.c
@@ -4345,7 +4345,8 @@ MODINIT_DEFINE(surface)
     c_api[2] = pgSurface_Blit;
     c_api[3] = pgSurface_SetSurface;
     apiobj = encapsulate_api(c_api, "surface");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/surflock.c b/src_c/surflock.c
@@ -234,7 +234,8 @@ MODINIT_DEFINE(surflock)
     c_api[4] = pgSurface_LockBy;
     c_api[5] = pgSurface_UnlockBy;
     apiobj = encapsulate_api(c_api, "surflock");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/system.c b/src_c/system.c
@@ -302,7 +302,8 @@ MODINIT_DEFINE(system)
         return NULL;
     }
 
-    if (PyModule_AddObjectRef(module, "PowerState", PowerState_class)) {
+    if (PyModule_AddObject(module, "PowerState", PowerState_class)) {
+        Py_DECREF(PowerState_class);
         Py_DECREF(module);
         return NULL;
     }
diff --git a/src_c/window.c b/src_c/window.c
@@ -1508,7 +1508,8 @@ MODINIT_DEFINE(window)
 
     c_api[0] = &pgWindow_Type;
     apiobj = encapsulate_api(c_api, "window");
-    if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
+        Py_XDECREF(apiobj);
         Py_DECREF(module);
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -2415,7 +2415,8 @@ MODINIT_DEFINE(_freetype)`
`2415`	`2415`	`c_api[1] = &pgFont_New;`
`2416`	`2416`
`2417`	`2417`	`apiobj = encapsulate_api(c_api, "freetype");`
`2418`		`- if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2418`	`+ if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2419`	`+ Py_XDECREF(apiobj);`
`2419`	`2420`	`Py_DECREF(module);`
`2420`	`2421`	`return NULL;`
`2421`	`2422`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2396,7 +2396,8 @@ MODINIT_DEFINE(base)`
`2396`	`2396`	`/* create the exceptions */`
`2397`	`2397`	`pgExc_SDLError =`
`2398`	`2398`	`PyErr_NewException("pygame.error", PyExc_RuntimeError, NULL);`
`2399`		`- if (PyModule_AddObjectRef(module, "error", pgExc_SDLError)) {`
	`2399`	`+ if (PyModule_AddObject(module, "error", pgExc_SDLError)) {`
	`2400`	`+ Py_XDECREF(pgExc_SDLError);`
`2400`	`2401`	`goto error;`
`2401`	`2402`	`}`
`2402`	`2403`
`@@ -2446,7 +2447,8 @@ MODINIT_DEFINE(base)`
`2446`	`2447`	`#endif`
`2447`	`2448`
`2448`	`2449`	`apiobj = encapsulate_api(c_api, "base");`
`2449`		`- if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2450`	`+ if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2451`	`+ Py_XDECREF(apiobj);`
`2450`	`2452`	`goto error;`
`2451`	`2453`	`}`
`2452`	`2454`
`@@ -2460,7 +2462,8 @@ MODINIT_DEFINE(base)`
`2460`	`2462`	`if (!version) {`
`2461`	`2463`	`goto error;`
`2462`	`2464`	`}`
`2463`		`- if (PyModule_AddObjectRef(module, "__version__", version)) {`
	`2465`	`+ if (PyModule_AddObject(module, "__version__", version)) {`
	`2466`	`+ Py_DECREF(version);`
`2464`	`2467`	`goto error;`
`2465`	`2468`	`}`
`2466`	`2469`
Original file line number	Diff line number	Diff line change
`@@ -2499,7 +2499,8 @@ MODINIT_DEFINE(color)`
`2499`	`2499`	`c_api[4] = pg_MappedColorFromObj;`
`2500`	`2500`
`2501`	`2501`	`apiobj = encapsulate_api(c_api, "color");`
`2502`		`- if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2502`	`+ if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2503`	`+ Py_XDECREF(apiobj);`
`2503`	`2504`	`goto error;`
`2504`	`2505`	`}`
`2505`	`2506`	`return module;`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,8 @@ MODINIT_DEFINE(constants)`
`648`	`648`	`DEC_CONSTS(FLASH_UNTIL_FOCUSED, -1);`
`649`	`649`	`#endif`
`650`	`650`
`651`		`- if (PyModule_AddObjectRef(module, "__all__", all_list)) {`
	`651`	`+ if (PyModule_AddObject(module, "__all__", all_list)) {`
	`652`	`+ Py_DECREF(all_list);`
`652`	`653`	`Py_DECREF(module);`
`653`	`654`	`return NULL;`
`654`	`655`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2602,7 +2602,8 @@ MODINIT_DEFINE(event)`
`2602`	`2602`	`c_api[9] = pgEvent_GetMouseButtonUpInfo;`
`2603`	`2603`
`2604`	`2604`	`apiobj = encapsulate_api(c_api, "event");`
`2605`		`- if (PyModule_AddObjectRef(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2605`	`+ if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {`
	`2606`	`+ Py_XDECREF(apiobj);`
`2606`	`2607`	`Py_DECREF(module);`
`2607`	`2608`	`return NULL;`
`2608`	`2609`	`}`