1 files changed, 40 insertions, 37 deletions

diff --git a/sources/shiboken6/libshiboken/voidptr.cpp b/sources/shiboken6/libshiboken/voidptr.cpp
index c047a8b7c..8bb3f6ac8 100644
--- a/sources/shiboken6/libshiboken/voidptr.cpp
+++ b/sources/shiboken6/libshiboken/voidptr.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "voidptr.h"
+#include "pep384ext.h"
 #include "sbkconverter.h"
 #include "basewrapper.h"
 #include "basewrapper_p.h"
@@ -10,22 +11,21 @@ extern "C"
 {
 
 // Void pointer object definition.
-typedef struct {
+struct SbkVoidPtrObject {
     PyObject_HEAD
     void *cptr;
     Py_ssize_t size;
     bool isWritable;
-} SbkVoidPtrObject;
+};
 
-PyObject *SbkVoidPtrObject_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+PyObject *SbkVoidPtrObject_new(PyTypeObject *type, PyObject * /* args */, PyObject * /* kwds */)
 {
     // PYSIDE-560: It is much safer to first call a function and then do a
     // type cast than to do everything in one line. The bad construct looked
     // like this, actual call forgotten:
     //    SbkVoidPtrObject *self =
     //        reinterpret_cast<SbkVoidPtrObject *>(type->tp_alloc);
-    PyObject *ob = type->tp_alloc(type, 0);
-    auto *self = reinterpret_cast<SbkVoidPtrObject *>(ob);
+    auto *self = PepExt_TypeCallAlloc<SbkVoidPtrObject>(type, 0);
 
     if (self != nullptr) {
         self->cptr = nullptr;
@@ -153,13 +153,12 @@ PyObject *SbkVoidPtrObject_int(PyObject *v)
     return PyLong_FromVoidPtr(sbkObject->cptr);
 }
 
-PyObject *toBytes(PyObject *self, PyObject *args)
+PyObject *toBytes(PyObject *self, PyObject * /* args */)
 {
     auto *sbkObject = reinterpret_cast<SbkVoidPtrObject *>(self);
-    if (sbkObject->size < 0) {
-        PyErr_SetString(PyExc_IndexError, "VoidPtr does not have a size set.");
-        return nullptr;
-    }
+    if (sbkObject->size < 0)
+        return PyErr_Format(PyExc_IndexError, "VoidPtr does not have a size set.");
+
     PyObject *bytes = PyBytes_FromStringAndSize(reinterpret_cast<const char *>(sbkObject->cptr),
                                                 sbkObject->size);
     Py_XINCREF(bytes);
@@ -167,8 +166,8 @@ PyObject *toBytes(PyObject *self, PyObject *args)
 }
 
 static struct PyMethodDef SbkVoidPtrObject_methods[] = {
-    {"toBytes", toBytes, METH_NOARGS},
-    {nullptr}
+    {"toBytes", toBytes, METH_NOARGS, nullptr},
+    {nullptr, nullptr, 0, nullptr}
 };
 
 static Py_ssize_t SbkVoidPtrObject_length(PyObject *v)
@@ -256,38 +255,42 @@ static PyBufferProcs SbkVoidPtrObjectBufferProc = {
     (releasebufferproc)nullptr                         // bf_releasebuffer
 };
 
-// Void pointer type definition.
-static PyType_Slot SbkVoidPtrType_slots[] = {
-    {Py_tp_repr, reinterpret_cast<void *>(SbkVoidPtrObject_repr)},
-    {Py_nb_int, reinterpret_cast<void *>(SbkVoidPtrObject_int)},
-    {Py_sq_length, reinterpret_cast<void *>(SbkVoidPtrObject_length)},
-    {Py_tp_str, reinterpret_cast<void *>(SbkVoidPtrObject_str)},
-    {Py_tp_richcompare, reinterpret_cast<void *>(SbkVoidPtrObject_richcmp)},
-    {Py_tp_init, reinterpret_cast<void *>(SbkVoidPtrObject_init)},
-    {Py_tp_new, reinterpret_cast<void *>(SbkVoidPtrObject_new)},
-    {Py_tp_dealloc, reinterpret_cast<void *>(Sbk_object_dealloc)},
-    {Py_tp_methods, reinterpret_cast<void *>(SbkVoidPtrObject_methods)},
-    {0, nullptr}
-};
-static PyType_Spec SbkVoidPtrType_spec = {
-    "2:shiboken6.Shiboken.VoidPtr",
-    sizeof(SbkVoidPtrObject),
-    0,
-    Py_TPFLAGS_DEFAULT,
-    SbkVoidPtrType_slots,
-};
-
-
+static PyTypeObject *createVoidPtrType()
+{
+    PyType_Slot SbkVoidPtrType_slots[] = {
+        {Py_tp_repr, reinterpret_cast<void *>(SbkVoidPtrObject_repr)},
+        {Py_nb_int, reinterpret_cast<void *>(SbkVoidPtrObject_int)},
+        {Py_sq_length, reinterpret_cast<void *>(SbkVoidPtrObject_length)},
+        {Py_tp_str, reinterpret_cast<void *>(SbkVoidPtrObject_str)},
+        {Py_tp_richcompare, reinterpret_cast<void *>(SbkVoidPtrObject_richcmp)},
+        {Py_tp_init, reinterpret_cast<void *>(SbkVoidPtrObject_init)},
+        {Py_tp_new, reinterpret_cast<void *>(SbkVoidPtrObject_new)},
+        {Py_tp_dealloc, reinterpret_cast<void *>(Sbk_object_dealloc)},
+        {Py_tp_methods, reinterpret_cast<void *>(SbkVoidPtrObject_methods)},
+        {0, nullptr}
+    };
+
+    PyType_Spec SbkVoidPtrType_spec = {
+        "2:shiboken6.Shiboken.VoidPtr",
+        sizeof(SbkVoidPtrObject),
+        0,
+        Py_TPFLAGS_DEFAULT,
+        SbkVoidPtrType_slots,
+    };
+
+    return SbkType_FromSpec_BMDWB(&SbkVoidPtrType_spec,
+                                  nullptr, nullptr, 0, 0,
+                                  &SbkVoidPtrObjectBufferProc);
 }
 
 PyTypeObject *SbkVoidPtr_TypeF(void)
 {
-    static PyTypeObject *type = SbkType_FromSpec_BMDWB(&SbkVoidPtrType_spec,
-                                                       nullptr, nullptr, 0, 0,
-                                                       &SbkVoidPtrObjectBufferProc);
+    static auto *type = createVoidPtrType();
     return type;
 }
 
+} // extern "C"
+
 namespace VoidPtr {
 
 static int voidPointerInitialized = false;