X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=timer.c;h=65e74fe807e543e302569b5fd419fbe3772cd032;hb=8cb45bf8df4d1fab4386bce349a1437443a9b0eb;hp=0c891368f8e038dcec0509e45c46efa420fe21e1;hpb=034c6ed7da5e44bfdde5a5d0da75f7b7a59953b8;p=elogind.git
diff --git a/timer.c b/timer.c
index 0c891368f..65e74fe80 100644
--- a/timer.c
+++ b/timer.c
@@ -1,29 +1,63 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
-#include "name.h"
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
+#include
+
+#include "unit.h"
#include "timer.h"
-static void timer_done(Name *n) {
- Timer *t = TIMER(n);
+static void timer_done(Unit *u) {
+ Timer *t = TIMER(u);
assert(t);
}
-static NameActiveState timer_active_state(Name *n) {
+static int timer_init(Unit *u) {
+ int r;
+
+ assert(u);
+
+ /* Make sure this config file actually exists */
+
+ if ((r = unit_load_fragment_and_dropin(u)) <= 0)
+ return r < 0 ? r : -ENOENT;
+
+ return 0;
+}
+
+static UnitActiveState timer_active_state(Unit *u) {
- static const NameActiveState table[_TIMER_STATE_MAX] = {
- [TIMER_DEAD] = NAME_INACTIVE,
- [TIMER_WAITING] = NAME_ACTIVE,
- [TIMER_RUNNING] = NAME_ACTIVE
+ static const UnitActiveState table[_TIMER_STATE_MAX] = {
+ [TIMER_DEAD] = UNIT_INACTIVE,
+ [TIMER_WAITING] = UNIT_ACTIVE,
+ [TIMER_RUNNING] = UNIT_ACTIVE
};
- return table[TIMER(n)->state];
+ return table[TIMER(u)->state];
}
-const NameVTable timer_vtable = {
+const UnitVTable timer_vtable = {
.suffix = ".timer",
- .init = name_load_fragment_and_dropin,
+ .init = timer_init,
.done = timer_done,
.active_state = timer_active_state