From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 16 Nov 2018 06:37:59 +0000 (+0100)
Subject: sd-event: do not use assert_return for something that is not an error
X-Git-Tag: v240~316
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d92a1a49080206983a0ea1884d9a2287e696bb7;p=thirdparty%2Fsystemd.git

sd-event: do not use assert_return for something that is not an error

It's totally OK for description to be unset, so let's not log about this
even at debug level.
---

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 27caa8681cd..8762b7b89d9 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1887,9 +1887,11 @@ _public_ int sd_event_source_set_description(sd_event_source *s, const char *des
 _public_ int sd_event_source_get_description(sd_event_source *s, const char **description) {
         assert_return(s, -EINVAL);
         assert_return(description, -EINVAL);
-        assert_return(s->description, -ENXIO);
         assert_return(!event_pid_changed(s->event), -ECHILD);
 
+        if (!s->description)
+                return -ENXIO;
+
         *description = s->description;
         return 0;
 }