From 995e23f1178d4207b9e13341577f26cd509d0892 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Thu, 2 May 2019 19:49:27 +0100 Subject: [PATCH] lib/talloc: squash 'cast between incompatible function types' warning To avoid warning above produced by using -Wcast-function-type we; + ensure PyCFunctions of type METH_NOARGS defined dummy arg Signed-off-by: Noel Power Reviewed-by: Andreas Schneider --- lib/talloc/pytalloc.c | 3 ++- lib/talloc/test_pytalloc.c | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c index ad3ad969a0f..b305b608f47 100644 --- a/lib/talloc/pytalloc.c +++ b/lib/talloc/pytalloc.c @@ -47,7 +47,8 @@ static PyObject *pytalloc_report_full(PyObject *self, PyObject *args) } /* enable null tracking */ -static PyObject *pytalloc_enable_null_tracking(PyObject *self) +static PyObject *pytalloc_enable_null_tracking(PyObject *self, + PyObject *Py_UNUSED(ignored)) { talloc_enable_null_tracking(); return Py_None; diff --git a/lib/talloc/test_pytalloc.c b/lib/talloc/test_pytalloc.c index a7c31c1ad5e..6797b98c6b9 100644 --- a/lib/talloc/test_pytalloc.c +++ b/lib/talloc/test_pytalloc.c @@ -30,25 +30,31 @@ #include #include -static PyObject *testpytalloc_new(PyTypeObject *mod) +static PyObject *testpytalloc_new(PyTypeObject *mod, + PyObject *Py_UNUSED(ignored)) { char *obj = talloc_strdup(NULL, "This is a test string");; return pytalloc_steal(pytalloc_GetObjectType(), obj); } -static PyObject *testpytalloc_get_object_type(PyObject *mod) { +static PyObject *testpytalloc_get_object_type(PyObject *mod, + PyObject *Py_UNUSED(ignored)) +{ PyObject *type = (PyObject *)pytalloc_GetObjectType(); Py_INCREF(type); return type; } -static PyObject *testpytalloc_base_new(PyTypeObject *mod) +static PyObject *testpytalloc_base_new(PyTypeObject *mod, + PyObject *Py_UNUSED(ignored)) { char *obj = talloc_strdup(NULL, "This is a test string for a BaseObject");; return pytalloc_steal(pytalloc_GetBaseObjectType(), obj); } -static PyObject *testpytalloc_base_get_object_type(PyObject *mod) { +static PyObject *testpytalloc_base_get_object_type(PyObject *mod, + PyObject *Py_UNUSED(ignored)) +{ PyObject *type = (PyObject *)pytalloc_GetBaseObjectType(); Py_INCREF(type); return type; -- 2.47.3