From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Nov 2015 22:32:52 +0000 (+0100)
Subject: sd-event: make _ref() calls NOPs when NULL is passed to them
X-Git-Tag: v229~301^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6680dd6b66e8a3e116819122ef66d89846d95f58;p=thirdparty%2Fsystemd.git

sd-event: make _ref() calls NOPs when NULL is passed to them

Let's make _ref() calls happy when NULL is passed to them, and simply
return NULL without any assertion logic. This makes them nicely
symmetric to the _unref() calls which also are happy to take NULL and
become NOPs then.
---

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 700ac691b5b..e68d76708a9 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -437,7 +437,9 @@ fail:
 }
 
 _public_ sd_event* sd_event_ref(sd_event *e) {
-        assert_return(e, NULL);
+
+        if (!e)
+                return NULL;
 
         assert(e->n_ref >= 1);
         e->n_ref++;
@@ -1339,7 +1341,9 @@ _public_ int sd_event_add_exit(
 }
 
 _public_ sd_event_source* sd_event_source_ref(sd_event_source *s) {
-        assert_return(s, NULL);
+
+        if (!s)
+                return NULL;
 
         assert(s->n_ref >= 1);
         s->n_ref++;