X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimer.h;h=814d9b203752876432698c7c754ae39d654c6c27;hp=69c5609a9c5631fc05e987c5ea0c8ebdc6acc724;hb=40b3203173ad78fdb5ceb257b08a93a587102518;hpb=871d7de47c13ee6cd78b8eefdf9128be3c740ac0 diff --git a/src/timer.h b/src/timer.h index 69c5609a9..814d9b203 100644 --- a/src/timer.h +++ b/src/timer.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef footimerhfoo #define footimerhfoo @@ -31,7 +31,7 @@ typedef enum TimerState { TIMER_WAITING, TIMER_RUNNING, TIMER_ELAPSED, - TIMER_MAINTAINANCE, + TIMER_MAINTENANCE, _TIMER_STATE_MAX, _TIMER_STATE_INVALID = -1 } TimerState; @@ -47,25 +47,22 @@ typedef enum TimerBase { } TimerBase; typedef struct TimerValue { - TimerBase base; usec_t value; - usec_t next_elapse; - bool disabled; - LIST_FIELDS(struct TimerValue, value); + + TimerBase base; + bool disabled; } TimerValue; struct Timer { Meta meta; LIST_HEAD(TimerValue, values); - - TimerState state, deserialized_state; - usec_t next_elapse; + TimerState state, deserialized_state; Unit *unit; Watch timer_watch;