chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible lack of status messages on shutdown/reboot
[elogind.git]
/
src
/
core
/
timer.c
diff --git
a/src/core/timer.c
b/src/core/timer.c
index b8039d82ec3549bf98ff11a96f5f3daa752e4c5b..b90c85f8238a20b771c3441fb607fcb6781d5143 100644
(file)
--- a/
src/core/timer.c
+++ b/
src/core/timer.c
@@
-54,7
+54,7
@@
void timer_free_values(Timer *t) {
assert(t);
while ((v = t->values)) {
assert(t);
while ((v = t->values)) {
- LIST_REMOVE(
TimerValue,
value, t->values, v);
+ LIST_REMOVE(value, t->values, v);
if (v->calendar_spec)
calendar_spec_free(v->calendar_spec);
if (v->calendar_spec)
calendar_spec_free(v->calendar_spec);
@@
-374,7
+374,7
@@
static void timer_enter_running(Timer *t) {
dbus_error_init(&error);
/* Don't start job if we are supposed to go down */
dbus_error_init(&error);
/* Don't start job if we are supposed to go down */
- if (unit_
pending_inactive
(UNIT(t)))
+ if (unit_
stop_pending
(UNIT(t)))
return;
r = manager_add_job(UNIT(t)->manager, JOB_START, UNIT_TRIGGER(UNIT(t)),
return;
r = manager_add_job(UNIT(t)->manager, JOB_START, UNIT_TRIGGER(UNIT(t)),
@@
-464,13
+464,13
@@
static int timer_deserialize_item(Unit *u, const char *key, const char *value, F
return 0;
}
return 0;
}
-static UnitActiveState timer_active_state(Unit *u) {
+
_pure_
static UnitActiveState timer_active_state(Unit *u) {
assert(u);
return state_translation_table[TIMER(u)->state];
}
assert(u);
return state_translation_table[TIMER(u)->state];
}
-static const char *timer_sub_state_to_string(Unit *u) {
+
_pure_
static const char *timer_sub_state_to_string(Unit *u) {
assert(u);
return timer_state_to_string(TIMER(u)->state);
assert(u);
return timer_state_to_string(TIMER(u)->state);