]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-event: do not use assert_return for something that is not an error
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 16 Nov 2018 06:37:59 +0000 (07:37 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 16 Nov 2018 08:00:33 +0000 (09:00 +0100)
It's totally OK for description to be unset, so let's not log about this
even at debug level.

src/libsystemd/sd-event/sd-event.c

index 27caa8681cd7765e9f0ea576681fa40083c79e8e..8762b7b89d99ff94958ca2cb1a0e4a28fa3bef9f 100644 (file)
@@ -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;
 }