From ec5cc955e760f652c1abb483367ebee4360c9d62 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 11 Sep 2019 19:47:59 +0100 Subject: [PATCH 1/2] Fix warnings in _testcapimodule --- Modules/_testcapimodule.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 21061a2171a052..3d9a733141a1a2 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -6205,7 +6205,7 @@ static PyType_Slot HeapGcCType_slots[] = { {Py_tp_init, heapctype_init}, {Py_tp_members, heapctype_members}, {Py_tp_dealloc, heapgcctype_dealloc}, - {Py_tp_doc, heapgctype__doc__}, + {Py_tp_doc, (char*)heapgctype__doc__}, {0, 0}, }; @@ -6233,7 +6233,7 @@ static PyType_Slot HeapCType_slots[] = { {Py_tp_init, heapctype_init}, {Py_tp_members, heapctype_members}, {Py_tp_dealloc, heapctype_dealloc}, - {Py_tp_doc, heapctype__doc__}, + {Py_tp_doc, (char*)heapctype__doc__}, {0, 0}, }; @@ -6274,7 +6274,7 @@ static struct PyMemberDef heapctypesubclass_members[] = { static PyType_Slot HeapCTypeSubclass_slots[] = { {Py_tp_init, heapctypesubclass_init}, {Py_tp_members, heapctypesubclass_members}, - {Py_tp_doc, heapctypesubclass__doc__}, + {Py_tp_doc, (char*)heapctypesubclass__doc__}, {0, 0}, }; @@ -6303,7 +6303,8 @@ heapctypesubclasswithfinalizer_init(PyObject *self, PyObject *args, PyObject *kw static void heapctypesubclasswithfinalizer_finalize(PyObject *self) { - PyObject *error_type, *error_value, *error_traceback, *m, *oldtype, *newtype; + PyObject *error_type, *error_value, *error_traceback, *m; + PyObject *oldtype=NULL, *newtype=NULL; /* Save the current exception, if any. */ PyErr_Fetch(&error_type, &error_value, &error_traceback); @@ -6342,7 +6343,7 @@ static PyType_Slot HeapCTypeSubclassWithFinalizer_slots[] = { {Py_tp_init, heapctypesubclasswithfinalizer_init}, {Py_tp_members, heapctypesubclass_members}, {Py_tp_finalize, heapctypesubclasswithfinalizer_finalize}, - {Py_tp_doc, heapctypesubclasswithfinalizer__doc__}, + {Py_tp_doc, (char*)heapctypesubclasswithfinalizer__doc__}, {0, 0}, }; @@ -6372,7 +6373,7 @@ static PyTypeObject MethInstance_Type = { .tp_new = PyType_GenericNew, .tp_flags = Py_TPFLAGS_DEFAULT, .tp_methods = meth_instance_methods, - .tp_doc = PyDoc_STR( + .tp_doc = (char*)PyDoc_STR( "Class with normal (instance) methods to test calling conventions"), }; From beb5170d216df99af82a824f168b36d84dd21f47 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 12 Sep 2019 08:40:42 +0100 Subject: [PATCH 2/2] Fix code style --- Modules/_testcapimodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 3d9a733141a1a2..dee06de107a1a3 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -6304,7 +6304,7 @@ static void heapctypesubclasswithfinalizer_finalize(PyObject *self) { PyObject *error_type, *error_value, *error_traceback, *m; - PyObject *oldtype=NULL, *newtype=NULL; + PyObject *oldtype = NULL, *newtype = NULL; /* Save the current exception, if any. */ PyErr_Fetch(&error_type, &error_value, &error_traceback); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy