From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 28 Jan 2017 02:50:06 +0000 (-0500)
Subject: logind: trivial simplification
X-Git-Tag: v233~186^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28a9ec4443458d99b3acbfb2d454515a5330118e;p=thirdparty%2Fsystemd.git

logind: trivial simplification

free_and_strdup() handles NULL arg, so make use of that.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 3873bf3e96c..ad44ca290e8 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2396,13 +2396,9 @@ static int method_set_wall_message(
         if (r == 0)
                 return 1; /* Will call us back */
 
-        if (isempty(wall_message))
-                m->wall_message = mfree(m->wall_message);
-        else {
-                r = free_and_strdup(&m->wall_message, wall_message);
-                if (r < 0)
-                        return log_oom();
-        }
+        r = free_and_strdup(&m->wall_message, empty_to_null(wall_message));
+        if (r < 0)
+                return log_oom();
 
         m->enable_wall_messages = enable_wall_messages;