X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=timer.c;h=41aeb7f3a5dbebb8c2f4cf1d3326a9463d7402da;hp=c3ebba0d1ba80220cfd97112bd91cdee6c21a7b7;hb=18149b9f57f8971ebc7d6401fc0a08a3173bcb29;hpb=d46de8a1a249e179687361dcaeba27e1c586253a

diff --git a/timer.c b/timer.c
index c3ebba0d1..41aeb7f3a 100644
--- a/timer.c
+++ b/timer.c
@@ -1,5 +1,24 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  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 <http://www.gnu.org/licenses/>.
+***/
+
 #include <errno.h>
 
 #include "unit.h"
@@ -11,19 +30,6 @@ static void timer_done(Unit *u) {
         assert(t);
 }
 
-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 UnitActiveState table[_TIMER_STATE_MAX] = {
@@ -38,7 +44,7 @@ static UnitActiveState timer_active_state(Unit *u) {
 const UnitVTable timer_vtable = {
         .suffix = ".timer",
 
-        .init = timer_init,
+        .load = unit_load_fragment_and_dropin,
         .done = timer_done,
 
         .active_state = timer_active_state