chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: fix a leak
[elogind.git]
/
src
/
core
/
timer.c
diff --git
a/src/core/timer.c
b/src/core/timer.c
index 13804434193fc800e847d76cb150d012e6317abe..9155dfc81fccedad8cef9638513d60a034da4407 100644
(file)
--- a/
src/core/timer.c
+++ b/
src/core/timer.c
@@
-147,10
+147,8
@@
static int timer_setup_persistent(Timer *t) {
_cleanup_free_ char *h = NULL;
r = get_home_dir(&h);
_cleanup_free_ char *h = NULL;
r = get_home_dir(&h);
- if (r < 0) {
- log_error("Failed to determine home directory: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to determine home directory: %m");
t->stamp_path = strjoin(h, "/.local/share/systemd/timers/stamp-", UNIT(t)->id, NULL);
}
t->stamp_path = strjoin(h, "/.local/share/systemd/timers/stamp-", UNIT(t)->id, NULL);
}
@@
-485,7
+483,7
@@
static void timer_enter_waiting(Timer *t, bool initial) {
return;
fail:
return;
fail:
- log_unit_warning
(UNIT(t)->id, "%s failed to enter waiting state: %s", UNIT(t)->id, strerror(-r)
);
+ log_unit_warning
_errno(UNIT(t)->id, r, "%s failed to enter waiting state: %m", UNIT(t)->id
);
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
}
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
}
@@
-507,7
+505,7
@@
static void timer_enter_running(Timer *t) {
dual_timestamp_get(&t->last_trigger);
if (t->stamp_path)
dual_timestamp_get(&t->last_trigger);
if (t->stamp_path)
- touch_file(t->stamp_path, true, t->last_trigger.realtime,
(uid_t) -1, (gid_t) -1
, 0);
+ touch_file(t->stamp_path, true, t->last_trigger.realtime,
UID_INVALID, GID_INVALID
, 0);
timer_set_state(t, TIMER_RUNNING);
return;
timer_set_state(t, TIMER_RUNNING);
return;
@@
-545,7
+543,7
@@
static int timer_start(Unit *u) {
/* The timer has never run before,
* make sure a stamp file exists.
*/
/* The timer has never run before,
* make sure a stamp file exists.
*/
- touch_file(t->stamp_path, true,
(usec_t) -1, (uid_t) -1, (gid_t) -1
, 0);
+ touch_file(t->stamp_path, true,
USEC_INFINITY, UID_INVALID, GID_INVALID
, 0);
}
t->result = TIMER_SUCCESS;
}
t->result = TIMER_SUCCESS;