picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

logind: trivial simplification

Browse source 
free_and_strdup() handles NULL arg, so make use of that.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-01-27 21:50:06 -05:00
parent 3ab2feefd7
commit 28a9ec4443
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/login/logind-dbus.c
View 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;