projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
543680f
)
login: use free_and_strdup() at one more place
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Mon, 7 Jan 2019 17:41:15 +0000
(
02:41
+0900)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Tue, 8 Jan 2019 14:44:50 +0000
(23:44 +0900)
src/login/logind-dbus.c
patch
|
blob
|
history
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index
2392435
..
bb3f6b8
100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-1502,7
+1502,6
@@
static int execute_shutdown_or_sleep(
sd_bus_error *error) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
- char *c = NULL;
const char *p;
int r;
@@
-1530,15
+1529,11
@@
static int execute_shutdown_or_sleep(
if (r < 0)
goto error;
- c = strdup(p);
- if (!c) {
- r = -ENOMEM;
+ r = free_and_strdup(&m->action_job, p);
+ if (r < 0)
goto error;
- }
m->action_unit = unit_name;
- free(m->action_job);
- m->action_job = c;
m->action_what = w;
/* Make sure the lid switch is ignored for a while */