modules: modernize variable declarations

Author: keszybz

src/systemd/_journal.c

@@ -15,21 +15,18 @@ PyDoc_STRVAR(journal_sendv__doc__,
 );
 
 static PyObject* journal_sendv(PyObject *self _unused_, PyObject *args) {
-        struct iovec *iov = NULL;
-        int argc;
-        int i, r;
         PyObject *ret = NULL;
-        PyObject **encoded;
+        int r;
 
         /* Allocate an array for the argument strings */
-        argc = PyTuple_Size(args);
-        encoded = alloca0(argc * sizeof(PyObject*));
+        int argc = PyTuple_Size(args);
+        PyObject **encoded = alloca0(argc * sizeof(PyObject*));
 
         /* Allocate sufficient iovector space for the arguments. */
-        iov = alloca(argc * sizeof(struct iovec));
+        struct iovec *iov = alloca(argc * sizeof(struct iovec));
 
         /* Iterate through the Python arguments and fill the iovector. */
-        for (i = 0; i < argc; ++i) {
+        for (int i = 0; i < argc; ++i) {
                 PyObject *item = PyTuple_GetItem(args, i);
                 char *stritem;
                 Py_ssize_t length;
@@ -60,7 +57,7 @@ static PyObject* journal_sendv(PyObject *self _unused_, PyObject *args) {
         ret = Py_None;
 
 out:
-        for (i = 0; i < argc; ++i)
+        for (int i = 0; i < argc; i++)
                 Py_XDECREF(encoded[i]);
 
         return ret;

src/systemd/_reader.c

@@ -108,21 +108,20 @@ static int null_converter(PyObject* obj, void *_result) {
  */
 static int strv_converter(PyObject* obj, void *_result) {
         char ***result = _result;
-        Py_ssize_t i, len;
 
         assert(result);
 
         if (!PySequence_Check(obj))
                 return 0;
 
-        len = PySequence_Length(obj);
+        Py_ssize_t len = PySequence_Length(obj);
         *result = new0(char*, len + 1);
         if (!*result) {
                 set_error(-ENOMEM, NULL, NULL);
                 return 0;
         }
 
-        for (i = 0; i < len; i++) {
+        for (Py_ssize_t i = 0; i < len; i++) {
                 PyObject *item;
                 _cleanup_Py_DECREF_ PyObject *bytes = NULL;
                 char *s;
@@ -168,23 +167,21 @@ static int long_as_fd(PyObject *obj, int *fd) {
  * Convert a Python sequence object into an int array.
  */
 static int intlist_converter(PyObject* obj, int **_result, size_t *_len) {
-        _cleanup_free_ int *result = NULL;
-        Py_ssize_t i, len;
-
         assert(_result);
         assert(_len);
 
         if (!PySequence_Check(obj))
                 return 0;
 
-        len = PySequence_Length(obj);
-        result = new0(int, len);
+        Py_ssize_t len = PySequence_Length(obj);
+        _cleanup_free_ int *result = new0(int, len);
+
         if (!result) {
                 set_error(-ENOMEM, NULL, NULL);
                 return 0;
         }
 
-        for (i = 0; i < len; i++) {
+        for (Py_ssize_t i = 0; i < len; i++) {
                 PyObject *item;
                 int fd;
 

src/systemd/login.c

@@ -18,7 +18,6 @@ PyDoc_STRVAR(module__doc__,
 static PyObject* name(PyObject *self _unused_, PyObject *args) {        \
         _cleanup_strv_free_ char **list = NULL;                         \
         int r;                                                          \
-        PyObject *ans;                                                  \
                                                                         \
         assert(!args);                                                  \
                                                                         \
@@ -28,7 +27,7 @@ static PyObject* name(PyObject *self _unused_, PyObject *args) {        \
                 return PyErr_SetFromErrno(PyExc_IOError);               \
         }                                                               \
                                                                         \
-        ans = PyList_New(r);                                            \
+        PyObject *ans = PyList_New(r);                                  \
         if (!ans)                                                       \
                 return NULL;                                            \
                                                                         \
@@ -53,7 +52,6 @@ helper(machine_names)
 static PyObject* uids(PyObject *self _unused_, PyObject *args) {
         _cleanup_free_ uid_t *list = NULL;
         int r;
-        PyObject *ans;
 
         assert(!args);
 
@@ -63,7 +61,7 @@ static PyObject* uids(PyObject *self _unused_, PyObject *args) {
                 return PyErr_SetFromErrno(PyExc_IOError);
         }
 
-        ans = PyList_New(r);
+        PyObject *ans = PyList_New(r);
         if (!ans)
                 return NULL;
 
@@ -121,7 +119,7 @@ typedef struct {
 static PyTypeObject MonitorType;
 
 static void Monitor_dealloc(Monitor* self) {
-        sd_login_monitor_unref(self->monitor);
+        self->monitor = sd_login_monitor_unref(self->monitor);
         Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -241,8 +239,7 @@ static PyObject* Monitor_close(Monitor *self, PyObject *args) {
         assert(self);
         assert(!args);
 
-        sd_login_monitor_unref(self->monitor);
-        self->monitor = NULL;
+        self->monitor = sd_login_monitor_unref(self->monitor);
         Py_RETURN_NONE;
 }