From c0e9a8b949617e3c43ffdac93615c3ab9d6e2e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 16 Jun 2019 14:45:01 +0200 Subject: Modernize C syntax --- systemd/_daemon.c | 24 ++++++++++++------------ systemd/_journal.c | 15 +++++++-------- systemd/_reader.c | 18 +++++++++--------- systemd/id128.c | 16 ++++++++-------- systemd/login.c | 8 ++++---- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/systemd/_daemon.c b/systemd/_daemon.c index f48b84a..6b0b670 100644 --- a/systemd/_daemon.c +++ b/systemd/_daemon.c @@ -65,7 +65,7 @@ PyDoc_STRVAR(booted__doc__, static PyObject* booted(PyObject *self, PyObject *args) { int r; - assert(args == NULL); + assert(!args); r = sd_booted(); if (set_error(r, NULL, NULL) < 0) @@ -108,7 +108,7 @@ static PyObject* notify(PyObject *self, PyObject *args, PyObject *keywds) { if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|OiO:notify", (char**) kwlist, &msg, &obj, &_pid, &fds)) return NULL; - if (obj != NULL) + if (obj) unset = PyObject_IsTrue(obj); if (unset < 0) return NULL; @@ -119,7 +119,7 @@ static PyObject* notify(PyObject *self, PyObject *args, PyObject *keywds) { return NULL; } - if (fds != NULL) { + if (fds) { Py_ssize_t i, len; len = PySequence_Length(fds); @@ -149,9 +149,9 @@ static PyObject* notify(PyObject *self, PyObject *args, PyObject *keywds) { n_fds = len; } - if (pid == 0 && fds == NULL) + if (pid == 0 && !fds) r = sd_notify(unset, msg); - else if (fds == NULL) { + else if (!fds) { #ifdef HAVE_PID_NOTIFY r = sd_pid_notify(pid, unset, msg); #else @@ -195,7 +195,7 @@ static PyObject* listen_fds(PyObject *self, PyObject *args, PyObject *keywds) { if (!PyArg_ParseTupleAndKeywords(args, keywds, "|O:_listen_fds", (char**) kwlist, &obj)) return NULL; - if (obj != NULL) + if (obj) unset = PyObject_IsTrue(obj); if (unset < 0) return NULL; @@ -507,7 +507,7 @@ PyMODINIT_FUNC init_daemon(void) { PyObject *m; m = Py_InitModule3("_daemon", methods, module__doc__); - if (m == NULL) + if (!m) return; PyModule_AddIntConstant(m, "LISTEN_FDS_START", SD_LISTEN_FDS_START); @@ -519,10 +519,10 @@ REENABLE_WARNING; static struct PyModuleDef module = { PyModuleDef_HEAD_INIT, - "_daemon", /* name of module */ - module__doc__, /* module documentation, may be NULL */ - 0, /* size of per-interpreter state of the module */ - methods + .m_name = "_daemon", /* name of module */ + .m_doc = module__doc__, /* module documentation, may be NULL */ + .m_size = 0, /* size of per-interpreter state of the module */ + .m_methods = methods, }; DISABLE_WARNING_MISSING_PROTOTYPES; @@ -530,7 +530,7 @@ PyMODINIT_FUNC PyInit__daemon(void) { PyObject *m; m = PyModule_Create(&module); - if (m == NULL) + if (!m) return NULL; if (PyModule_AddIntConstant(m, "LISTEN_FDS_START", SD_LISTEN_FDS_START) || diff --git a/systemd/_journal.c b/systemd/_journal.c index 52f1e7f..4f53dba 100644 --- a/systemd/_journal.c +++ b/systemd/_journal.c @@ -54,7 +54,7 @@ static PyObject *journal_sendv(PyObject *self, PyObject *args) { if (PyUnicode_Check(item)) { encoded[i] = PyUnicode_AsEncodedString(item, "utf-8", "strict"); - if (encoded[i] == NULL) + if (!encoded[i]) goto out; item = encoded[i]; } @@ -110,7 +110,7 @@ static PyObject* journal_stream_fd(PyObject *self, PyObject *args) { static PyMethodDef methods[] = { { "sendv", journal_sendv, METH_VARARGS, journal_sendv__doc__ }, { "stream_fd", journal_stream_fd, METH_VARARGS, journal_stream_fd__doc__ }, - { NULL, NULL, 0, NULL } /* Sentinel */ + {} /* Sentinel */ }; #if PY_MAJOR_VERSION < 3 @@ -120,7 +120,7 @@ PyMODINIT_FUNC init_journal(void) { PyObject *m; m = Py_InitModule("_journal", methods); - if (m == NULL) + if (!m) return; PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION); @@ -131,10 +131,9 @@ REENABLE_WARNING; static struct PyModuleDef module = { PyModuleDef_HEAD_INIT, - "_journal", /* name of module */ - NULL, /* module documentation, may be NULL */ - -1, /* size of per-interpreter state of the module */ - methods + .m_name = "_journal", /* name of module */ + .m_size = -1, /* size of per-interpreter state of the module */ + .m_methods = methods, }; DISABLE_WARNING_MISSING_PROTOTYPES; @@ -142,7 +141,7 @@ PyMODINIT_FUNC PyInit__journal(void) { PyObject *m; m = PyModule_Create(&module); - if (m == NULL) + if (!m) return NULL; if (PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)) { diff --git a/systemd/_reader.c b/systemd/_reader.c index 5b7e191..e8ebc56 100644 --- a/systemd/_reader.c +++ b/systemd/_reader.c @@ -286,7 +286,7 @@ static int Reader_init(Reader *self, PyObject *args, PyObject *keywds) { _cleanup_Py_DECREF_ PyObject *item0 = NULL; item0 = PySequence_GetItem(_files, 0); - if (item0 == NULL || !PyLong_Check(item0)) { + if (!item0 || !PyLong_Check(item0)) { _cleanup_strv_free_ char **files = NULL; if (!strv_converter(_files, &files)) @@ -1184,7 +1184,7 @@ static PyObject* Reader_get_data_threshold(Reader *self, void *closure) { static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closure) { int r; - if (value == NULL) { + if (!value) { PyErr_SetString(PyExc_AttributeError, "Cannot delete data threshold"); return -1; } @@ -1201,7 +1201,7 @@ static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closur PyDoc_STRVAR(closed__doc__, "True iff journal is closed"); static PyObject* Reader_get_closed(Reader *self, void *closure) { - return PyBool_FromLong(self->j == NULL); + return PyBool_FromLong(!self->j); } static PyGetSetDef Reader_getsetters[] = { @@ -1276,10 +1276,10 @@ static PyMethodDef methods[] = { #if PY_MAJOR_VERSION >= 3 static PyModuleDef module = { PyModuleDef_HEAD_INIT, - "_reader", - module__doc__, - -1, - methods, + .m_name = "_reader", + .m_doc = module__doc__, + .m_size = -1, + .m_methods = methods, }; #endif @@ -1309,7 +1309,7 @@ init_reader(void) #if PY_MAJOR_VERSION >= 3 m = PyModule_Create(&module); - if (m == NULL) + if (!m) return NULL; if (!initialized) { @@ -1318,7 +1318,7 @@ init_reader(void) } #else m = Py_InitModule3("_reader", methods, module__doc__); - if (m == NULL) + if (!m) return; #endif diff --git a/systemd/id128.c b/systemd/id128.c index f5d6aa6..a00e8e8 100644 --- a/systemd/id128.c +++ b/systemd/id128.c @@ -85,7 +85,7 @@ static PyObject* make_uuid(sd_id128_t id) { sd_id128_t id; \ int r; \ \ - assert(args == NULL); \ + assert(!args); \ \ r = sd_id128_##name(&id); \ if (r < 0) { \ @@ -104,7 +104,7 @@ static PyMethodDef methods[] = { { "randomize", randomize, METH_NOARGS, randomize__doc__}, { "get_machine", get_machine, METH_NOARGS, get_machine__doc__}, { "get_boot", get_boot, METH_NOARGS, get_boot__doc__}, - { NULL, NULL, 0, NULL } /* Sentinel */ + {} /* Sentinel */ }; static int add_id(PyObject *module, const char* name, sd_id128_t id) { @@ -124,7 +124,7 @@ PyMODINIT_FUNC initid128(void) { PyObject *m; m = Py_InitModule3("id128", methods, module__doc__); - if (m == NULL) + if (!m) return; /* a series of lines like 'add_id() ;' follow */ @@ -139,10 +139,10 @@ REENABLE_WARNING; static struct PyModuleDef module = { PyModuleDef_HEAD_INIT, - "id128", /* name of module */ - module__doc__, /* module documentation, may be NULL */ - -1, /* size of per-interpreter state of the module */ - methods + .m_name = "id128", /* name of module */ + .m_doc = module__doc__, /* module documentation */ + .m_size = -1, /* size of per-interpreter state of the module */ + .m_methods = methods, }; DISABLE_WARNING_MISSING_PROTOTYPES; @@ -150,7 +150,7 @@ PyMODINIT_FUNC PyInit_id128(void) { PyObject *m; m = PyModule_Create(&module); - if (m == NULL) + if (!m) return NULL; if ( /* a series of lines like 'add_id() ||' follow */ diff --git a/systemd/login.c b/systemd/login.c index ff74dc7..dc9abbe 100644 --- a/systemd/login.c +++ b/systemd/login.c @@ -38,7 +38,7 @@ static PyObject* name(PyObject *self, PyObject *args) { \ int r; \ PyObject *ans; \ \ - assert(args == NULL); \ + assert(!args); \ \ r = sd_get_##name(&list); \ if (r < 0) { \ @@ -73,7 +73,7 @@ static PyObject* uids(PyObject *self, PyObject *args) { int r; PyObject *ans; - assert(args == NULL); + assert(!args); r = sd_get_uids(&list); if (r < 0) { @@ -323,7 +323,7 @@ PyMODINIT_FUNC initlogin(void) { return; m = Py_InitModule3("login", methods, module__doc__); - if (m == NULL) + if (!m) return; PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION); @@ -351,7 +351,7 @@ PyMODINIT_FUNC PyInit_login(void) { return NULL; m = PyModule_Create(&module); - if (m == NULL) + if (!m) return NULL; if (PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)) { -- cgit v1.2.1