From a9ad964cf16c691a8cd97c1e7fa6416b66c85e95 Mon Sep 17 00:00:00 2001 From: Jo Sutton Date: Tue, 12 Dec 2023 17:38:02 +1300 Subject: [PATCH] pyglue: Remove global variables used in only one place Signed-off-by: Jo Sutton Reviewed-by: Martin Schwenke --- python/pyglue.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/python/pyglue.c b/python/pyglue.c index 27cd41d5b9c..042bf9e14f3 100644 --- a/python/pyglue.c +++ b/python/pyglue.c @@ -29,11 +29,6 @@ #include "lib/cmdline/cmdline.h" #include "lib/crypto/gkdi.h" -static PyObject *PyExc_NTSTATUSError; -static PyObject *PyExc_WERRORError; -static PyObject *PyExc_HRESULTError; -static PyObject *PyExc_DsExtendedError; - static PyObject *py_generate_random_str(PyObject *self, PyObject *args) { Py_ssize_t len; @@ -610,28 +605,24 @@ MODULE_INIT_FUNC(_glue) PyModule_AddObject(m, "version", PyUnicode_FromString(SAMBA_VERSION_STRING)); - PyExc_NTSTATUSError = PyErr_NewException("samba.NTSTATUSError", PyExc_RuntimeError, NULL); - if (PyExc_NTSTATUSError != NULL) { - Py_INCREF(PyExc_NTSTATUSError); - PyModule_AddObject(m, "NTSTATUSError", PyExc_NTSTATUSError); + py_obj = PyErr_NewException("samba.NTSTATUSError", PyExc_RuntimeError, NULL); + if (py_obj != NULL) { + PyModule_AddObject(m, "NTSTATUSError", py_obj); } - PyExc_WERRORError = PyErr_NewException("samba.WERRORError", PyExc_RuntimeError, NULL); - if (PyExc_WERRORError != NULL) { - Py_INCREF(PyExc_WERRORError); - PyModule_AddObject(m, "WERRORError", PyExc_WERRORError); + py_obj = PyErr_NewException("samba.WERRORError", PyExc_RuntimeError, NULL); + if (py_obj != NULL) { + PyModule_AddObject(m, "WERRORError", py_obj); } - PyExc_HRESULTError = PyErr_NewException("samba.HRESULTError", PyExc_RuntimeError, NULL); - if (PyExc_HRESULTError != NULL) { - Py_INCREF(PyExc_HRESULTError); - PyModule_AddObject(m, "HRESULTError", PyExc_HRESULTError); + py_obj = PyErr_NewException("samba.HRESULTError", PyExc_RuntimeError, NULL); + if (py_obj != NULL) { + PyModule_AddObject(m, "HRESULTError", py_obj); } - PyExc_DsExtendedError = PyErr_NewException("samba.DsExtendedError", PyExc_RuntimeError, NULL); - if (PyExc_DsExtendedError != NULL) { - Py_INCREF(PyExc_DsExtendedError); - PyModule_AddObject(m, "DsExtendedError", PyExc_DsExtendedError); + py_obj = PyErr_NewException("samba.DsExtendedError", PyExc_RuntimeError, NULL); + if (py_obj != NULL) { + PyModule_AddObject(m, "DsExtendedError", py_obj); } ret = PyModule_AddIntConstant(m, "GKDI_L1_KEY_ITERATION", gkdi_l1_key_iteration); -- 2.47.3