systemd-python: fix setting of exception codes

The return value of 0 would be treated as failure by mistake,
resulting in " SystemError: error return without exception set".
The way that set_error() is used is changed to be the same
everywhere.

diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c
index f0ab16f659e2367f87057da2886ab1860a51084a..c6db69fe260443f623a9dae3b82444fa9836a75b 100644 (file)
--- a/src/python-systemd/_daemon.c
+++ b/src/python-systemd/_daemon.c
@@ -88,7 +88,7 @@ static PyObject* notify(PyObject *self, PyObject *args, PyObject *keywds) {
 #endif
 
         r = sd_notify(unset, msg);
 #endif
 
         r = sd_notify(unset, msg);

-        if (set_error(r, NULL, NULL))
+        if (set_error(r, NULL, NULL) < 0)

                 return NULL;
 
         return PyBool_FromLong(r);
                 return NULL;
 
         return PyBool_FromLong(r);


@@ -123,7 +123,7 @@ static PyObject* listen_fds(PyObject *self, PyObject *args, PyObject *keywds) {
 #endif
 
         r = sd_listen_fds(unset);
 #endif
 
         r = sd_listen_fds(unset);

-        if (set_error(r, NULL, NULL))
+        if (set_error(r, NULL, NULL) < 0)

                 return NULL;
 
         return long_FromLong(r);
                 return NULL;
 
         return long_FromLong(r);


@@ -151,7 +151,7 @@ static PyObject* is_fifo(PyObject *self, PyObject *args) {
 #endif
 
         r = sd_is_fifo(fd, path);
 #endif
 
         r = sd_is_fifo(fd, path);

-        if (set_error(r, path, NULL))
+        if (set_error(r, path, NULL) < 0)

                 return NULL;
 
         return PyBool_FromLong(r);
                 return NULL;
 
         return PyBool_FromLong(r);


@@ -179,7 +179,7 @@ static PyObject* is_mq(PyObject *self, PyObject *args) {
 #endif
 
         r = sd_is_mq(fd, path);
 #endif
 
         r = sd_is_mq(fd, path);

-        if (set_error(r, path, NULL))
+        if (set_error(r, path, NULL) < 0)

                 return NULL;
 
         return PyBool_FromLong(r);
                 return NULL;
 
         return PyBool_FromLong(r);


@@ -203,7 +203,7 @@ static PyObject* is_socket(PyObject *self, PyObject *args) {
                 return NULL;
 
         r = sd_is_socket(fd, family, type, listening);
                 return NULL;
 
         r = sd_is_socket(fd, family, type, listening);

-        if (set_error(r, NULL, NULL))
+        if (set_error(r, NULL, NULL) < 0)

                 return NULL;
 
         return PyBool_FromLong(r);
                 return NULL;
 
         return PyBool_FromLong(r);


@@ -230,7 +230,7 @@ static PyObject* is_socket_inet(PyObject *self, PyObject *args) {
         }
 
         r = sd_is_socket_inet(fd, family, type, listening, (uint16_t) port);
         }
 
         r = sd_is_socket_inet(fd, family, type, listening, (uint16_t) port);

-        if (set_error(r, NULL, NULL))
+        if (set_error(r, NULL, NULL) < 0)

                 return NULL;
 
         return PyBool_FromLong(r);
                 return NULL;
 
         return PyBool_FromLong(r);


@@ -265,7 +265,7 @@ static PyObject* is_socket_unix(PyObject *self, PyObject *args) {
 #endif
 
         r = sd_is_socket_unix(fd, type, listening, path, length);
 #endif
 
         r = sd_is_socket_unix(fd, type, listening, path, length);

-        if (set_error(r, path, NULL))
+        if (set_error(r, path, NULL) < 0)

                 return NULL;
 
         return PyBool_FromLong(r);
                 return NULL;
 
         return PyBool_FromLong(r);

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index 101260698507bd788ab8b5e1d272ba8607e03988..ee25c49741e97fe5474f7f1842689da2d8e44343 100644 (file)
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -202,8 +202,7 @@ PyDoc_STRVAR(Reader_reliable_fd__doc__,
              "See man:sd_journal_reliable_fd(3).");
 static PyObject* Reader_reliable_fd(Reader *self, PyObject *args) {
     int r = sd_journal_reliable_fd(self->j);
              "See man:sd_journal_reliable_fd(3).");
 static PyObject* Reader_reliable_fd(Reader *self, PyObject *args) {
     int r = sd_journal_reliable_fd(self->j);

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     return PyBool_FromLong(r);
 }
         return NULL;
     return PyBool_FromLong(r);
 }


@@ -216,8 +215,7 @@ PyDoc_STRVAR(Reader_get_events__doc__,
              "See man:sd_journal_get_events(3) for further discussion.");
 static PyObject* Reader_get_events(Reader *self, PyObject *args) {
     int r = sd_journal_get_events(self->j);
              "See man:sd_journal_get_events(3) for further discussion.");
 static PyObject* Reader_get_events(Reader *self, PyObject *args) {
     int r = sd_journal_get_events(self->j);

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     return long_FromLong(r);
 }
         return NULL;
     return long_FromLong(r);
 }


@@ -236,8 +234,7 @@ static PyObject* Reader_get_timeout(Reader *self, PyObject *args) {
     uint64_t t;
 
     r = sd_journal_get_timeout(self->j, &t);
     uint64_t t;
 
     r = sd_journal_get_timeout(self->j, &t);

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     if (t == (uint64_t) -1)
         return NULL;
 
     if (t == (uint64_t) -1)


@@ -258,8 +255,7 @@ static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args) {
     uint64_t t;
 
     r = sd_journal_get_timeout(self->j, &t);
     uint64_t t;
 
     r = sd_journal_get_timeout(self->j, &t);

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     return absolute_timeout(t);
         return NULL;
 
     return absolute_timeout(t);


@@ -295,7 +291,7 @@ static PyObject* Reader_get_usage(Reader *self, PyObject *args) {
     uint64_t bytes;
 
     r = sd_journal_get_usage(self->j, &bytes);
     uint64_t bytes;
 
     r = sd_journal_get_usage(self->j, &bytes);

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     assert_cc(sizeof(unsigned long long) == sizeof(bytes));
         return NULL;
 
     assert_cc(sizeof(unsigned long long) == sizeof(bytes));


@@ -354,8 +350,7 @@ static PyObject* Reader_next(Reader *self, PyObject *args) {
         assert_not_reached("should not be here");
     Py_END_ALLOW_THREADS
 
         assert_not_reached("should not be here");
     Py_END_ALLOW_THREADS
 

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     return PyBool_FromLong(r);
 }
         return NULL;
     return PyBool_FromLong(r);
 }


@@ -431,7 +426,8 @@ static PyObject* Reader_get(Reader *self, PyObject *args) {
     if (r == -ENOENT) {
         PyErr_SetString(PyExc_KeyError, field);
         return NULL;
     if (r == -ENOENT) {
         PyErr_SetString(PyExc_KeyError, field);
         return NULL;

-    } else if (set_error(r, NULL, "field name is not valid"))
+    }
+    if (set_error(r, NULL, "field name is not valid") < 0)

         return NULL;
 
     r = extract(msg, msg_len, NULL, &value);
         return NULL;
 
     r = extract(msg, msg_len, NULL, &value);


@@ -514,7 +510,7 @@ static PyObject* Reader_get_realtime(Reader *self, PyObject *args) {
     assert(!args);
 
     r = sd_journal_get_realtime_usec(self->j, &timestamp);
     assert(!args);
 
     r = sd_journal_get_realtime_usec(self->j, &timestamp);

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     assert_cc(sizeof(unsigned long long) == sizeof(timestamp));
         return NULL;
 
     assert_cc(sizeof(unsigned long long) == sizeof(timestamp));


@@ -538,7 +534,7 @@ static PyObject* Reader_get_monotonic(Reader *self, PyObject *args) {
     assert(!args);
 
     r = sd_journal_get_monotonic_usec(self->j, &timestamp, &id);
     assert(!args);
 
     r = sd_journal_get_monotonic_usec(self->j, &timestamp, &id);

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     assert_cc(sizeof(unsigned long long) == sizeof(timestamp));
         return NULL;
 
     assert_cc(sizeof(unsigned long long) == sizeof(timestamp));


@@ -580,8 +576,7 @@ static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds
         return NULL;
 
     r = sd_journal_add_match(self->j, match, match_len);
         return NULL;
 
     r = sd_journal_add_match(self->j, match, match_len);

-    set_error(r, NULL, "Invalid match");
-    if (r < 0)
+    if (set_error(r, NULL, "Invalid match") < 0)

             return NULL;
 
     Py_RETURN_NONE;
             return NULL;
 
     Py_RETURN_NONE;


@@ -597,8 +592,7 @@ PyDoc_STRVAR(Reader_add_disjunction__doc__,
 static PyObject* Reader_add_disjunction(Reader *self, PyObject *args) {
     int r;
     r = sd_journal_add_disjunction(self->j);
 static PyObject* Reader_add_disjunction(Reader *self, PyObject *args) {
     int r;
     r = sd_journal_add_disjunction(self->j);

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     Py_RETURN_NONE;
 }
         return NULL;
     Py_RETURN_NONE;
 }


@@ -613,8 +607,7 @@ PyDoc_STRVAR(Reader_add_conjunction__doc__,
 static PyObject* Reader_add_conjunction(Reader *self, PyObject *args) {
     int r;
     r = sd_journal_add_conjunction(self->j);
 static PyObject* Reader_add_conjunction(Reader *self, PyObject *args) {
     int r;
     r = sd_journal_add_conjunction(self->j);

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     Py_RETURN_NONE;
 }
         return NULL;
     Py_RETURN_NONE;
 }


@@ -639,7 +632,7 @@ static PyObject* Reader_seek_head(Reader *self, PyObject *args) {
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_head(self->j);
     Py_END_ALLOW_THREADS
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_head(self->j);
     Py_END_ALLOW_THREADS

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     Py_RETURN_NONE;
 }
         return NULL;
     Py_RETURN_NONE;
 }


@@ -655,7 +648,7 @@ static PyObject* Reader_seek_tail(Reader *self, PyObject *args) {
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_tail(self->j);
     Py_END_ALLOW_THREADS
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_tail(self->j);
     Py_END_ALLOW_THREADS

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     Py_RETURN_NONE;
 }
         return NULL;
     Py_RETURN_NONE;
 }


@@ -675,7 +668,7 @@ static PyObject* Reader_seek_realtime(Reader *self, PyObject *args) {
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_realtime_usec(self->j, timestamp);
     Py_END_ALLOW_THREADS
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_realtime_usec(self->j, timestamp);
     Py_END_ALLOW_THREADS

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
     Py_RETURN_NONE;
 }
         return NULL;
     Py_RETURN_NONE;
 }


@@ -698,20 +691,20 @@ static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args) {
 
     if (bootid) {
         r = sd_id128_from_string(bootid, &id);
 
     if (bootid) {
         r = sd_id128_from_string(bootid, &id);

-        if (set_error(r, NULL, "Invalid bootid"))
+        if (set_error(r, NULL, "Invalid bootid") < 0)

             return NULL;
     } else {
         Py_BEGIN_ALLOW_THREADS
         r = sd_id128_get_boot(&id);
         Py_END_ALLOW_THREADS
             return NULL;
     } else {
         Py_BEGIN_ALLOW_THREADS
         r = sd_id128_get_boot(&id);
         Py_END_ALLOW_THREADS

-        if (set_error(r, NULL, NULL))
+        if (set_error(r, NULL, NULL) < 0)

             return NULL;
     }
 
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_monotonic_usec(self->j, id, timestamp);
     Py_END_ALLOW_THREADS
             return NULL;
     }
 
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_monotonic_usec(self->j, id, timestamp);
     Py_END_ALLOW_THREADS

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     Py_RETURN_NONE;
         return NULL;
 
     Py_RETURN_NONE;


@@ -781,7 +774,7 @@ static PyObject* Reader_seek_cursor(Reader *self, PyObject *args) {
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_cursor(self->j, cursor);
     Py_END_ALLOW_THREADS
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_cursor(self->j, cursor);
     Py_END_ALLOW_THREADS

-    if (set_error(r, NULL, "Invalid cursor"))
+    if (set_error(r, NULL, "Invalid cursor") < 0)

         return NULL;
     Py_RETURN_NONE;
 }
         return NULL;
     Py_RETURN_NONE;
 }


@@ -799,7 +792,7 @@ static PyObject* Reader_get_cursor(Reader *self, PyObject *args) {
     assert(!args);
 
     r = sd_journal_get_cursor(self->j, &cursor);
     assert(!args);
 
     r = sd_journal_get_cursor(self->j, &cursor);

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     return unicode_FromString(cursor);
         return NULL;
 
     return unicode_FromString(cursor);


@@ -821,8 +814,7 @@ static PyObject* Reader_test_cursor(Reader *self, PyObject *args) {
         return NULL;
 
     r = sd_journal_test_cursor(self->j, cursor);
         return NULL;
 
     r = sd_journal_test_cursor(self->j, cursor);

-    set_error(r, NULL, NULL);
-    if (r < 0)
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     return PyBool_FromLong(r);
         return NULL;
 
     return PyBool_FromLong(r);


@@ -845,7 +837,7 @@ static PyObject* Reader_query_unique(Reader *self, PyObject *args) {
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_query_unique(self->j, query);
     Py_END_ALLOW_THREADS
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_query_unique(self->j, query);
     Py_END_ALLOW_THREADS

-    if (set_error(r, NULL, "Invalid field name"))
+    if (set_error(r, NULL, "Invalid field name") < 0)

         return NULL;
 
     value_set = PySet_New(0);
         return NULL;
 
     value_set = PySet_New(0);


@@ -898,7 +890,8 @@ static PyObject* Reader_get_catalog(Reader *self, PyObject *args) {
         else
             set_error(r, NULL, NULL);
         return NULL;
         else
             set_error(r, NULL, NULL);
         return NULL;

-    } else if (set_error(r, NULL, NULL))
+    }
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     return unicode_FromString(msg);
         return NULL;
 
     return unicode_FromString(msg);


@@ -922,13 +915,13 @@ static PyObject* get_catalog(PyObject *self, PyObject *args) {
         return NULL;
 
     r = sd_id128_from_string(id_, &id);
         return NULL;
 
     r = sd_id128_from_string(id_, &id);

-    if (set_error(r, NULL, "Invalid id128"))
+    if (set_error(r, NULL, "Invalid id128") < 0)

         return NULL;
 
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_get_catalog_for_message_id(id, &msg);
     Py_END_ALLOW_THREADS
         return NULL;
 
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_get_catalog_for_message_id(id, &msg);
     Py_END_ALLOW_THREADS

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     return unicode_FromString(msg);
         return NULL;
 
     return unicode_FromString(msg);


@@ -945,7 +938,7 @@ static PyObject* Reader_get_data_threshold(Reader *self, void *closure) {
     int r;
 
     r = sd_journal_get_data_threshold(self->j, &cvalue);
     int r;
 
     r = sd_journal_get_data_threshold(self->j, &cvalue);

-    if (set_error(r, NULL, NULL))
+    if (set_error(r, NULL, NULL) < 0)

         return NULL;
 
     return long_FromSize_t(cvalue);
         return NULL;
 
     return long_FromSize_t(cvalue);