]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
logind: trivial simplification
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 28 Jan 2017 02:50:06 +0000 (21:50 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 31 Jan 2017 05:47:07 +0000 (00:47 -0500)
free_and_strdup() handles NULL arg, so make use of that.

src/login/logind-dbus.c

index 3873bf3e96cfe64c319dd519891b4ddb0f25e6df..ad44ca290e8e61d3ef3be12a79cccd377c8de22c 100644 (file)
@@ -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;