modules: silence warnings about unused params

_unused_ is used for 'self' wherever the function does not use self.
assert(!args) is added in the places where METH_NOARGS is used.
assert(self) is added in a few places where self _is_ used.

Author: keszybz

src/systemd/_daemon.c

@@ -35,8 +35,9 @@ PyDoc_STRVAR(booted__doc__,
              "Wraps sd_booted(3)."
 );
 
-static PyObject* booted(PyObject *self, PyObject *args) {
+static PyObject* booted(PyObject *self _unused_, PyObject *args) {
         int r;
+
         assert(!args);
 
         r = sd_booted();
@@ -55,7 +56,7 @@ PyDoc_STRVAR(notify__doc__,
              "Send a message to the init system about a status change.\n"
              "Wraps sd_notify(3).");
 
-static PyObject* notify(PyObject *self, PyObject *args, PyObject *keywds) {
+static PyObject* notify(PyObject *self _unused_, PyObject *args, PyObject *keywds) {
         int r;
         const char* msg;
         int unset = false, n_fds;
@@ -142,7 +143,7 @@ PyDoc_STRVAR(listen_fds__doc__,
              "Wraps sd_listen_fds(3)."
 );
 
-static PyObject* listen_fds(PyObject *self, PyObject *args, PyObject *keywds) {
+static PyObject* listen_fds(PyObject *self _unused_, PyObject *args, PyObject *keywds) {
         int r;
         int unset = true;
 
@@ -176,7 +177,8 @@ static void free_names(char **names) {
                 free(*n);
         free(names);
 }
-static PyObject* listen_fds_with_names(PyObject *self, PyObject *args, PyObject *keywds) {
+
+static PyObject* listen_fds_with_names(PyObject *self _unused_, PyObject *args, PyObject *keywds) {
         int r;
         int unset = false;
         char **names = NULL;
@@ -228,7 +230,7 @@ PyDoc_STRVAR(is_fifo__doc__,
 );
 
 
-static PyObject* is_fifo(PyObject *self, PyObject *args) {
+static PyObject* is_fifo(PyObject *self _unused_, PyObject *args) {
         int r;
         int fd;
         const char *path = NULL;
@@ -254,7 +256,7 @@ PyDoc_STRVAR(is_mq__doc__,
              "Wraps sd_is_mq(3)."
 );
 
-static PyObject* is_mq(PyObject *self, PyObject *args) {
+static PyObject* is_mq(PyObject *self _unused_, PyObject *args) {
         int r;
         int fd;
         const char *path = NULL;
@@ -282,7 +284,7 @@ PyDoc_STRVAR(is_socket__doc__,
              "Constants for `family` are defined in the socket module."
 );
 
-static PyObject* is_socket(PyObject *self, PyObject *args) {
+static PyObject* is_socket(PyObject *self _unused_, PyObject *args) {
         int r;
         int fd, family = AF_UNSPEC, type = 0, listening = -1;
 
@@ -304,7 +306,7 @@ PyDoc_STRVAR(is_socket_inet__doc__,
              "Constants for `family` are defined in the socket module."
 );
 
-static PyObject* is_socket_inet(PyObject *self, PyObject *args) {
+static PyObject* is_socket_inet(PyObject *self _unused_, PyObject *args) {
         int r;
         int fd, family = AF_UNSPEC, type = 0, listening = -1, port = 0;
 
@@ -337,7 +339,7 @@ PyDoc_STRVAR(is_socket_sockaddr__doc__,
 #endif
 );
 
-static PyObject* is_socket_sockaddr(PyObject *self, PyObject *args) {
+static PyObject* is_socket_sockaddr(PyObject *self _unused_, PyObject *args) {
         int r;
         int fd, type = 0, flowinfo = 0, listening = -1;
         const char *address;
@@ -384,7 +386,7 @@ PyDoc_STRVAR(is_socket_unix__doc__,
              "Wraps sd_is_socket_unix(3)."
 );
 
-static PyObject* is_socket_unix(PyObject *self, PyObject *args) {
+static PyObject* is_socket_unix(PyObject *self _unused_, PyObject *args) {
         int r;
         int fd, type = 0, listening = -1;
         char* path = NULL;

src/systemd/_journal.c

@@ -14,7 +14,7 @@ PyDoc_STRVAR(journal_sendv__doc__,
              "Send an entry to the journal."
 );
 
-static PyObject *journal_sendv(PyObject *self, PyObject *args) {
+static PyObject* journal_sendv(PyObject *self _unused_, PyObject *args) {
         struct iovec *iov = NULL;
         int argc;
         int i, r;
@@ -71,7 +71,7 @@ PyDoc_STRVAR(journal_stream_fd__doc__,
              "Open a stream to journal by calling sd_journal_stream_fd(3)."
 );
 
-static PyObject* journal_stream_fd(PyObject *self, PyObject *args) {
+static PyObject* journal_stream_fd(PyObject *self _unused_, PyObject *args) {
         const char* identifier;
         int priority, level_prefix;
         int fd;

src/systemd/_reader.c

@@ -337,6 +337,9 @@ PyDoc_STRVAR(Reader_fileno__doc__,
 static PyObject* Reader_fileno(Reader *self, PyObject *args) {
         int fd;
 
+        assert(self);
+        assert(!args);
+
         fd = sd_journal_get_fd(self->j);
         set_error(fd, NULL, NULL);
         if (fd < 0)
@@ -352,6 +355,9 @@ PyDoc_STRVAR(Reader_reliable_fd__doc__,
 static PyObject* Reader_reliable_fd(Reader *self, PyObject *args) {
         int r;
 
+        assert(self);
+        assert(!args);
+
         r = sd_journal_reliable_fd(self->j);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
@@ -366,6 +372,9 @@ PyDoc_STRVAR(Reader_get_events__doc__,
 static PyObject* Reader_get_events(Reader *self, PyObject *args) {
         int r;
 
+        assert(self);
+        assert(!args);
+
         r = sd_journal_get_events(self->j);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
@@ -384,6 +393,9 @@ static PyObject* Reader_get_timeout(Reader *self, PyObject *args) {
         int r;
         uint64_t t;
 
+        assert(self);
+        assert(!args);
+
         r = sd_journal_get_timeout(self->j, &t);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
@@ -404,6 +416,9 @@ static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args) {
         int r;
         uint64_t t;
 
+        assert(self);
+        assert(!args);
+
         r = sd_journal_get_timeout(self->j, &t);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
@@ -438,6 +453,9 @@ static PyObject* Reader_get_usage(Reader *self, PyObject *args) {
         int r;
         uint64_t bytes;
 
+        assert(self);
+        assert(!args);
+
         r = sd_journal_get_usage(self->j, &bytes);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
@@ -462,7 +480,9 @@ PyDoc_STRVAR(Reader___exit____doc__,
              "__exit__(type, value, traceback) -> None\n\n"
              "Part of the context manager protocol.\n"
              "Closes the journal.\n");
-static PyObject* Reader___exit__(Reader *self, PyObject *args) {
+static PyObject* Reader___exit__(Reader *self, PyObject *args _unused_) {
+        assert(self);
+
         return Reader_close(self, NULL);
 }
 
@@ -475,6 +495,8 @@ static PyObject* Reader_next(Reader *self, PyObject *args) {
         int64_t skip = 1LL;
         int r = -EUCLEAN;
 
+        assert(self);
+
         if (!PyArg_ParseTuple(args, "|L:next", &skip))
                 return NULL;
 
@@ -590,6 +612,9 @@ static PyObject* Reader_get_all(Reader *self, PyObject *args) {
         size_t msg_len;
         int r;
 
+        assert(self);
+        assert(!args);
+
         dict = PyDict_New();
         if (!dict)
                 return NULL;
@@ -706,6 +731,7 @@ static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds
         char *match;
         Py_ssize_t match_len;
         int r;
+
         if (!PyArg_ParseTuple(args, "s#:add_match", &match, &match_len))
                 return NULL;
 
@@ -729,6 +755,10 @@ PyDoc_STRVAR(Reader_add_disjunction__doc__,
              "See :manpage:`sd_journal_add_disjunction(3)` for explanation.");
 static PyObject* Reader_add_disjunction(Reader *self, PyObject *args) {
         int r;
+
+        assert(self);
+        assert(!args);
+
         r = sd_journal_add_disjunction(self->j);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
@@ -743,6 +773,10 @@ PyDoc_STRVAR(Reader_add_conjunction__doc__,
              "See :manpage:`sd_journal_add_disjunction(3)` for explanation.");
 static PyObject* Reader_add_conjunction(Reader *self, PyObject *args) {
         int r;
+
+        assert(self);
+        assert(!args);
+
         r = sd_journal_add_conjunction(self->j);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
@@ -753,6 +787,9 @@ PyDoc_STRVAR(Reader_flush_matches__doc__,
              "flush_matches() -> None\n\n"
              "Clear all current match filters.");
 static PyObject* Reader_flush_matches(Reader *self, PyObject *args) {
+        assert(self);
+        assert(!args);
+
         sd_journal_flush_matches(self->j);
         Py_RETURN_NONE;
 }
@@ -764,6 +801,10 @@ PyDoc_STRVAR(Reader_seek_head__doc__,
              "See :manpage:`sd_journal_seek_head(3)`.");
 static PyObject* Reader_seek_head(Reader *self, PyObject *args) {
         int r;
+
+        assert(self);
+        assert(!args);
+
         Py_BEGIN_ALLOW_THREADS
         r = sd_journal_seek_head(self->j);
         Py_END_ALLOW_THREADS
@@ -782,6 +823,9 @@ PyDoc_STRVAR(Reader_seek_tail__doc__,
 static PyObject* Reader_seek_tail(Reader *self, PyObject *args) {
         int r;
 
+        assert(self);
+        assert(!args);
+
         Py_BEGIN_ALLOW_THREADS
         r = sd_journal_seek_tail(self->j);
         Py_END_ALLOW_THREADS
@@ -799,6 +843,8 @@ static PyObject* Reader_seek_realtime(Reader *self, PyObject *args) {
         uint64_t timestamp;
         int r;
 
+        assert(self);
+
         if (!PyArg_ParseTuple(args, "K:seek_realtime", &timestamp))
                 return NULL;
 
@@ -824,6 +870,8 @@ static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args) {
         sd_id128_t id;
         int r;
 
+        assert(self);
+
         if (!PyArg_ParseTuple(args, "K|z:seek_monotonic", &timestamp, &bootid))
                 return NULL;
 
@@ -1061,6 +1109,9 @@ PyDoc_STRVAR(Reader_enumerate_fields__doc__,
              "Return a set of field names appearing in the journal.\n"
              "See sd_journal_enumerate_fields(3).");
 static PyObject* Reader_enumerate_fields(Reader *self, PyObject *args) {
+        assert(self);
+        assert(!args);
+
 #if HAVE_ENUMERATE_FIELDS
         _cleanup_Py_DECREF_ PyObject *_value_set = NULL;
         PyObject *value_set;
@@ -1103,6 +1154,9 @@ PyDoc_STRVAR(Reader_has_runtime_files__doc__,
              "Returns true if runtime journal files have been found.\n\n"
              "See :manpage:`sd_journal_test_cursor(3)`.");
 static PyObject* Reader_has_runtime_files(Reader *self, PyObject *args) {
+        assert(self);
+        assert(!args);
+
 #if HAVE_ENUMERATE_FIELDS
         int r;
 
@@ -1124,6 +1178,9 @@ PyDoc_STRVAR(Reader_has_persistent_files__doc__,
              "Returns true if persistent journal files have been found.\n\n"
              "See :manpage:`sd_journal_test_cursor(3)`.");
 static PyObject* Reader_has_persistent_files(Reader *self, PyObject *args) {
+        assert(self);
+        assert(!args);
+
 #if HAVE_ENUMERATE_FIELDS
         int r;
 
@@ -1185,7 +1242,7 @@ PyDoc_STRVAR(get_catalog__doc__,
              "get_catalog(id128) -> str\n\n"
              "Retrieve a message catalog entry for the given id.\n"
              "Wraps :manpage:`sd_journal_get_catalog_for_message_id(3)`.");
-static PyObject* get_catalog(PyObject *self, PyObject *args) {
+static PyObject* get_catalog(PyObject *self _unused_, PyObject *args) {
         int r;
         char *id_ = NULL;
         sd_id128_t id;
@@ -1215,20 +1272,24 @@ PyDoc_STRVAR(data_threshold__doc__,
              "Fields longer than this will be truncated to the threshold size.\n"
              "Defaults to 64Kb.");
 
-static PyObject* Reader_get_data_threshold(Reader *self, void *closure) {
+static PyObject* Reader_get_data_threshold(Reader *self, void *closure _unused_) {
         size_t cvalue;
         int r;
 
+        assert(self);
+
         r = sd_journal_get_data_threshold(self->j, &cvalue);
         if (set_error(r, NULL, NULL) < 0)
                 return NULL;
 
         return long_FromSize_t(cvalue);
 }
 
-static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closure) {
+static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closure _unused_) {
         int r;
 
+        assert(self);
+
         if (!value) {
                 PyErr_SetString(PyExc_AttributeError, "Cannot delete data threshold");
                 return -1;
@@ -1245,7 +1306,9 @@ 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) {
+static PyObject* Reader_get_closed(Reader *self, void *closure _unused_) {
+        assert(self);
+
         return PyBool_FromLong(!self->j);
 }
 

src/systemd/id128.c

@@ -69,27 +69,27 @@ static PyObject* make_uuid(sd_id128_t id) {
         return PyObject_Call(UUID, args, kwargs);
 }
 
-#define helper(name)                                                    \
-        static PyObject *name(PyObject *self, PyObject *args) {         \
-                sd_id128_t id;                                          \
-                int r;                                                  \
-                                                                        \
-                assert(!args);                                          \
-                                                                        \
-                r = sd_id128_##name(&id);                               \
-                if (r < 0) {                                            \
-                        errno = -r;                                     \
-                        return PyErr_SetFromErrno(PyExc_IOError);       \
-                }                                                       \
-                                                                        \
-                return make_uuid(id);                                   \
+#define helper(name)                                                     \
+        static PyObject *name(PyObject *self _unused_, PyObject *args) { \
+                sd_id128_t id;                                           \
+                int r;                                                   \
+                                                                         \
+                assert(!args);                                           \
+                                                                         \
+                r = sd_id128_##name(&id);                                \
+                if (r < 0) {                                             \
+                        errno = -r;                                      \
+                        return PyErr_SetFromErrno(PyExc_IOError);        \
+                }                                                        \
+                                                                         \
+                return make_uuid(id);                                    \
         }
 
 helper(randomize)
 helper(get_machine)
 helper(get_boot)
 
-static PyObject *get_machine_app_specific(PyObject *self, PyObject *args) {
+static PyObject *get_machine_app_specific(PyObject *self _unused_, PyObject *args) {
         _cleanup_Py_DECREF_ PyObject *uuid_bytes = NULL;
 
         uuid_bytes = PyObject_GetAttrString(args, "bytes");