From 2a683cff7e7ac4f94ce545a0907d5b5b883c2a36 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Sun, 29 Dec 2013 23:39:28 -0500

Subject: [PATCH] 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.

---

 src/python-systemd/_daemon.c | 14 +++++-----

 src/python-systemd/_reader.c | 63 ++++++++++++++++++++------------------------

 2 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c

index f0ab16f..c6db69f 100644

--- 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);

-        if (set_error(r, NULL, NULL))

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

                 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);

-        if (set_error(r, NULL, NULL))

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

                 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);

-        if (set_error(r, path, NULL))

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

                 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);

-        if (set_error(r, path, NULL))

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

                 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);

-        if (set_error(r, NULL, NULL))

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

                 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);

-        if (set_error(r, NULL, NULL))

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

                 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);

-        if (set_error(r, path, NULL))

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

                 return NULL;

         return PyBool_FromLong(r);

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c

index bc5db19..0c88926 100644

--- a/src/python-systemd/_reader.c

+++ b/src/python-systemd/_reader.c

@@ -206,8 +206,7 @@ PyDoc_STRVAR(Reader_reliable_fd__doc__,

 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);

 }

@@ -221,8 +220,7 @@ PyDoc_STRVAR(Reader_get_events__doc__,

 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);

 }

@@ -242,8 +240,7 @@ static PyObject* Reader_get_timeout(Reader *self, PyObject *args)

     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)

@@ -265,8 +262,7 @@ static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args)

     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);

@@ -304,7 +300,7 @@ static PyObject* Reader_get_usage(Reader *self, PyObject *args)

     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));

@@ -366,8 +362,7 @@ static PyObject* Reader_next(Reader *self, PyObject *args)

         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);

 }

@@ -445,7 +440,8 @@ static PyObject* Reader_get(Reader *self, PyObject *args)

     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);

@@ -530,7 +526,7 @@ static PyObject* Reader_get_realtime(Reader *self, PyObject *args)

     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));

@@ -555,7 +551,7 @@ static PyObject* Reader_get_monotonic(Reader *self, PyObject *args)

     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));

@@ -598,8 +594,7 @@ static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds

         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;

@@ -616,8 +611,7 @@ 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;

 }

@@ -633,8 +627,7 @@ 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;

 }

@@ -661,7 +654,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

-    if (set_error(r, NULL, NULL))

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

         return NULL;

     Py_RETURN_NONE;

 }

@@ -678,7 +671,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

-    if (set_error(r, NULL, NULL))

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

         return NULL;

     Py_RETURN_NONE;

 }

@@ -699,7 +692,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

-    if (set_error(r, NULL, NULL))

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

         return NULL;

     Py_RETURN_NONE;

 }

@@ -723,20 +716,20 @@ static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args)

     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

-        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

-    if (set_error(r, NULL, NULL))

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

         return NULL;

     Py_RETURN_NONE;

@@ -809,7 +802,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

-    if (set_error(r, NULL, "Invalid cursor"))

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

         return NULL;

     Py_RETURN_NONE;

 }

@@ -828,7 +821,7 @@ static PyObject* Reader_get_cursor(Reader *self, PyObject *args)

     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);

@@ -851,8 +844,7 @@ static PyObject* Reader_test_cursor(Reader *self, PyObject *args)

         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);

@@ -876,7 +868,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

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

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

         return NULL;

     value_set = PySet_New(0);

@@ -930,7 +922,8 @@ static PyObject* Reader_get_catalog(Reader *self, PyObject *args)

         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);

@@ -955,13 +948,13 @@ static PyObject* get_catalog(PyObject *self, PyObject *args)

         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

-    if (set_error(r, NULL, NULL))

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

         return NULL;

     return unicode_FromString(msg);

@@ -979,7 +972,7 @@ static PyObject* Reader_get_data_threshold(Reader *self, void *closure)

     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);