chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6f1cc1
)
logind: trivial simplification
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 28 Jan 2017 02:50:06 +0000
(21:50 -0500)
committer
Sven Eden
<yamakuzure@gmx.net>
Mon, 17 Jul 2017 15:58:36 +0000
(17:58 +0200)
free_and_strdup() handles NULL arg, so make use of that.
src/login/logind-dbus.c
patch
|
blob
|
history
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index d1eabdbf63a350623366ebfd6b413347c00d3463..598b931422d12110aaff60a2f6fb4e9b9bf9d401 100644
(file)
--- 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;