diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-01-27 21:50:06 -0500 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 17:58:36 +0200 |
commit | a5c28308446550e0966825472babdf123fc976ac (patch) | |
tree | cc07150e5895457c477d5872bb199d0579cbff35 /src/login/logind-dbus.c | |
parent | e6f1cc1ecaf4cefa1c8a892aab6e136b1061c6a3 (diff) |
logind: trivial simplification
free_and_strdup() handles NULL arg, so make use of that.
Diffstat (limited to 'src/login/logind-dbus.c')
-rw-r--r-- | src/login/logind-dbus.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index d1eabdbf6..598b93142 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2464,13 +2464,9 @@ static int method_set_wall_message( return 1; /* Will call us back */ #endif // 0 - 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; |