typo: the correct spelling is maintenance not maintainance

diff --git a/DISTRO_PORTING b/DISTRO_PORTING
index 59e4e92291b65863a1178d1d97ee5b2de5a7cfb5..fedbc0e3e4667ebca7550bc1e69f2cf6fa3976a9 100644 (file)
--- a/DISTRO_PORTING
+++ b/DISTRO_PORTING
@@ -41,7 +41,7 @@ CONTRIBUTING UPSTREAM:
 
 BE CONSIDERATE:
         We'd like to keep differences between the distributions
-        minimal. This both simplifies our maintainance work, as well
+        minimal. This both simplifies our maintenance work, as well
         as it helps administrators to move from one distribution to
         another.
 

diff --git a/fixme b/fixme
index e39e7251dc6e51a581d54685850b5a2010f3cce7..460376440a0624994a30892776b0085fa927b470 100644 (file)
--- a/fixme
+++ b/fixme
@@ -57,8 +57,6 @@
 
 * use setproctitle() when forking, before exec() (waiting for (PR_SET_PROCTITLE_AREA to enter the kernel)
 
-* s/maintainance/maintenance/
-
 * follow property change dbus spec
 
 Regularly:

diff --git a/src/automount.c b/src/automount.c
index d83f3ed053aecbf4c54397160db3b5c0a827f7e3..3d85605fb4f46a7cd7f110b278716bd99deb31d0 100644 (file)
--- a/src/automount.c
+++ b/src/automount.c
@@ -40,7 +40,7 @@ static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD] = UNIT_INACTIVE,
         [AUTOMOUNT_WAITING] = UNIT_ACTIVE,
         [AUTOMOUNT_RUNNING] = UNIT_ACTIVE,
-        [AUTOMOUNT_MAINTAINANCE] = UNIT_INACTIVE,
+        [AUTOMOUNT_MAINTENANCE] = UNIT_INACTIVE,
 };
 
 static int open_dev_autofs(Manager *m);
@@ -264,7 +264,7 @@ static void automount_enter_dead(Automount *a, bool success) {
         if (!success)
                 a->failure = true;
 
-        automount_set_state(a, a->failure ? AUTOMOUNT_MAINTAINANCE : AUTOMOUNT_DEAD);
+        automount_set_state(a, a->failure ? AUTOMOUNT_MAINTENANCE : AUTOMOUNT_DEAD);
 }
 
 static int open_dev_autofs(Manager *m) {
@@ -562,7 +562,7 @@ static int automount_start(Unit *u) {
 
         assert(a);
 
-        assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_MAINTAINANCE);
+        assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_MAINTENANCE);
 
         if (path_is_mount_point(a->where)) {
                 log_error("Path %s is already a mount point, refusing start for %s", a->where, u->meta.id);
@@ -754,7 +754,7 @@ static const char* const automount_state_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD] = "dead",
         [AUTOMOUNT_WAITING] = "waiting",
         [AUTOMOUNT_RUNNING] = "running",
-        [AUTOMOUNT_MAINTAINANCE] = "maintainance"
+        [AUTOMOUNT_MAINTENANCE] = "maintenance"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(automount_state, AutomountState);

diff --git a/src/automount.h b/src/automount.h
index 014482cc5a8be261a2b8c6a042d04c21cf447765..44e6100ff691c8ec2a8313f70f2608b5447c5c9f 100644 (file)
--- a/src/automount.h
+++ b/src/automount.h
@@ -30,7 +30,7 @@ typedef enum AutomountState {
         AUTOMOUNT_DEAD,
         AUTOMOUNT_WAITING,
         AUTOMOUNT_RUNNING,
-        AUTOMOUNT_MAINTAINANCE,
+        AUTOMOUNT_MAINTENANCE,
         _AUTOMOUNT_STATE_MAX,
         _AUTOMOUNT_STATE_INVALID = -1
 } AutomountState;

diff --git a/src/mount.c b/src/mount.c
index a8f3d7b9aac7741e46afcf6b304970eb44e567e9..4a38e957003d6b8c14cc5d8d0ba6b2f14f13725d 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -49,7 +49,7 @@ static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
         [MOUNT_REMOUNTING_SIGKILL] = UNIT_ACTIVE_RELOADING,
         [MOUNT_UNMOUNTING_SIGTERM] = UNIT_DEACTIVATING,
         [MOUNT_UNMOUNTING_SIGKILL] = UNIT_DEACTIVATING,
-        [MOUNT_MAINTAINANCE] = UNIT_INACTIVE,
+        [MOUNT_MAINTENANCE] = UNIT_INACTIVE,
 };
 
 static void mount_init(Unit *u) {
@@ -416,7 +416,7 @@ static void mount_set_state(Mount *m, MountState state) {
                  state == MOUNT_REMOUNTING_SIGKILL ||
                  state == MOUNT_UNMOUNTING_SIGTERM ||
                  state == MOUNT_UNMOUNTING_SIGKILL ||
-                 state == MOUNT_MAINTAINANCE)
+                 state == MOUNT_MAINTENANCE)
                 mount_notify_automount(m, -ENODEV);
 
         if (state != old_state)
@@ -555,7 +555,7 @@ static void mount_enter_dead(Mount *m, bool success) {
         if (!success)
                 m->failure = true;
 
-        mount_set_state(m, m->failure ? MOUNT_MAINTAINANCE : MOUNT_DEAD);
+        mount_set_state(m, m->failure ? MOUNT_MAINTENANCE : MOUNT_DEAD);
 }
 
 static void mount_enter_mounted(Mount *m, bool success) {
@@ -780,7 +780,7 @@ static int mount_start(Unit *u) {
             m->state == MOUNT_MOUNTING_SIGKILL)
                 return 0;
 
-        assert(m->state == MOUNT_DEAD || m->state == MOUNT_MAINTAINANCE);
+        assert(m->state == MOUNT_DEAD || m->state == MOUNT_MAINTENANCE);
 
         m->failure = false;
         mount_enter_mounting(m);
@@ -1435,7 +1435,7 @@ void mount_fd_event(Manager *m, int events) {
                         switch (mount->state) {
 
                         case MOUNT_DEAD:
-                        case MOUNT_MAINTAINANCE:
+                        case MOUNT_MAINTENANCE:
                                 mount_enter_mounted(mount, true);
                                 break;
 
@@ -1523,7 +1523,7 @@ static const char* const mount_state_table[_MOUNT_STATE_MAX] = {
         [MOUNT_REMOUNTING_SIGKILL] = "remounting-sigkill",
         [MOUNT_UNMOUNTING_SIGTERM] = "unmounting-sigterm",
         [MOUNT_UNMOUNTING_SIGKILL] = "unmounting-sigkill",
-        [MOUNT_MAINTAINANCE] = "maintainance"
+        [MOUNT_MAINTENANCE] = "maintenance"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(mount_state, MountState);

diff --git a/src/mount.h b/src/mount.h
index 3b28e89ed3ecac2a3a94c21f0b0a91f00ba8ea05..30da1368ffedaba9d4735ed0c8cf12ee273510d3 100644 (file)
--- a/src/mount.h
+++ b/src/mount.h
@@ -39,7 +39,7 @@ typedef enum MountState {
         MOUNT_REMOUNTING_SIGKILL,
         MOUNT_UNMOUNTING_SIGTERM,
         MOUNT_UNMOUNTING_SIGKILL,
-        MOUNT_MAINTAINANCE,
+        MOUNT_MAINTENANCE,
         _MOUNT_STATE_MAX,
         _MOUNT_STATE_INVALID = -1
 } MountState;

diff --git a/src/path.c b/src/path.c
index b40a8297ffb7b21401a63cc1e9253466287752f8..8a940d0262d617657e2cfa213a133aa46f571512 100644 (file)
--- a/src/path.c
+++ b/src/path.c
@@ -34,7 +34,7 @@ static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
         [PATH_DEAD] = UNIT_INACTIVE,
         [PATH_WAITING] = UNIT_ACTIVE,
         [PATH_RUNNING] = UNIT_ACTIVE,
-        [PATH_MAINTAINANCE] = UNIT_INACTIVE
+        [PATH_MAINTENANCE] = UNIT_INACTIVE
 };
 
 static void path_done(Unit *u) {
@@ -290,7 +290,7 @@ static void path_enter_dead(Path *p, bool success) {
         if (!success)
                 p->failure = true;
 
-        path_set_state(p, p->failure ? PATH_MAINTAINANCE : PATH_DEAD);
+        path_set_state(p, p->failure ? PATH_MAINTENANCE : PATH_DEAD);
 }
 
 static void path_enter_running(Path *p) {
@@ -363,7 +363,7 @@ static int path_start(Unit *u) {
         Path *p = PATH(u);
 
         assert(p);
-        assert(p->state == PATH_DEAD || p->state == PATH_MAINTAINANCE);
+        assert(p->state == PATH_DEAD || p->state == PATH_MAINTENANCE);
 
         if (p->unit->meta.load_state != UNIT_LOADED)
                 return -ENOENT;
@@ -540,7 +540,7 @@ static const char* const path_state_table[_PATH_STATE_MAX] = {
         [PATH_DEAD] = "dead",
         [PATH_WAITING] = "waiting",
         [PATH_RUNNING] = "running",
-        [PATH_MAINTAINANCE] = "maintainance"
+        [PATH_MAINTENANCE] = "maintenance"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(path_state, PathState);

diff --git a/src/path.h b/src/path.h
index 21a7dc49348025211f5e7a44a1143df0e317b298..e0feeea7117145362cf5e9ddad3e7edb45acd4f3 100644 (file)
--- a/src/path.h
+++ b/src/path.h
@@ -31,7 +31,7 @@ typedef enum PathState {
         PATH_DEAD,
         PATH_WAITING,
         PATH_RUNNING,
-        PATH_MAINTAINANCE,
+        PATH_MAINTENANCE,
         _PATH_STATE_MAX,
         _PATH_STATE_INVALID = -1
 } PathState;

diff --git a/src/service.c b/src/service.c
index 6e35a4da58e9df2b3b1e83324424615bdaee8e85..a38c88076eeb46ded4fa938eec309141b26b15c2 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -82,7 +82,7 @@ static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
         [SERVICE_STOP_POST] = UNIT_DEACTIVATING,
         [SERVICE_FINAL_SIGTERM] = UNIT_DEACTIVATING,
         [SERVICE_FINAL_SIGKILL] = UNIT_DEACTIVATING,
-        [SERVICE_MAINTAINANCE] = UNIT_INACTIVE,
+        [SERVICE_MAINTENANCE] = UNIT_INACTIVE,
         [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING,
 };
 
@@ -1079,7 +1079,7 @@ static void service_set_state(Service *s, ServiceState state) {
             state == SERVICE_STOP_POST ||
             state == SERVICE_FINAL_SIGTERM ||
             state == SERVICE_FINAL_SIGKILL ||
-            state == SERVICE_MAINTAINANCE ||
+            state == SERVICE_MAINTENANCE ||
             state == SERVICE_AUTO_RESTART)
                 service_notify_sockets_dead(s);
 
@@ -1350,7 +1350,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) {
 
                 service_set_state(s, SERVICE_AUTO_RESTART);
         } else
-                service_set_state(s, s->failure ? SERVICE_MAINTAINANCE : SERVICE_DEAD);
+                service_set_state(s, s->failure ? SERVICE_MAINTENANCE : SERVICE_DEAD);
 
         return;
 
@@ -1737,7 +1737,7 @@ static int service_start(Unit *u) {
             s->state == SERVICE_START_POST)
                 return 0;
 
-        assert(s->state == SERVICE_DEAD || s->state == SERVICE_MAINTAINANCE || s->state == SERVICE_AUTO_RESTART);
+        assert(s->state == SERVICE_DEAD || s->state == SERVICE_MAINTENANCE || s->state == SERVICE_AUTO_RESTART);
 
         /* Make sure we don't enter a busy loop of some kind. */
         if (!ratelimit_test(&s->ratelimit)) {
@@ -2167,7 +2167,7 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
                 break;
 
         case SERVICE_FINAL_SIGKILL:
-                log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", u->meta.id);
+                log_warning("%s still around after SIGKILL (2). Entering maintenance mode.", u->meta.id);
                 service_enter_dead(s, false, true);
                 break;
 
@@ -2499,7 +2499,7 @@ static const char* const service_state_table[_SERVICE_STATE_MAX] = {
         [SERVICE_STOP_POST] = "stop-post",
         [SERVICE_FINAL_SIGTERM] = "final-sigterm",
         [SERVICE_FINAL_SIGKILL] = "final-sigkill",
-        [SERVICE_MAINTAINANCE] = "maintainance",
+        [SERVICE_MAINTENANCE] = "maintenance",
         [SERVICE_AUTO_RESTART] = "auto-restart",
 };
 

diff --git a/src/service.h b/src/service.h
index d644e7207ab41fa1e26f83f9bcb73e76e16caa71..521baaa1fb903df9e892558a63941e25db402062 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -41,7 +41,7 @@ typedef enum ServiceState {
         SERVICE_STOP_POST,
         SERVICE_FINAL_SIGTERM,     /* In case the STOP_POST executable hangs, we shoot that down, too */
         SERVICE_FINAL_SIGKILL,
-        SERVICE_MAINTAINANCE,
+        SERVICE_MAINTENANCE,
         SERVICE_AUTO_RESTART,
         _SERVICE_STATE_MAX,
         _SERVICE_STATE_INVALID = -1

diff --git a/src/socket.c b/src/socket.c
index 66131f867d7a6e240a35722a2ae957c9f316a580..1852fe93755a507837ed4067c5e3af162377cad8 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -49,7 +49,7 @@ static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
         [SOCKET_STOP_POST] = UNIT_DEACTIVATING,
         [SOCKET_FINAL_SIGTERM] = UNIT_DEACTIVATING,
         [SOCKET_FINAL_SIGKILL] = UNIT_DEACTIVATING,
-        [SOCKET_MAINTAINANCE] = UNIT_INACTIVE,
+        [SOCKET_MAINTENANCE] = UNIT_INACTIVE,
 };
 
 static void socket_init(Unit *u) {
@@ -707,7 +707,7 @@ static void socket_enter_dead(Socket *s, bool success) {
         if (!success)
                 s->failure = true;
 
-        socket_set_state(s, s->failure ? SOCKET_MAINTAINANCE : SOCKET_DEAD);
+        socket_set_state(s, s->failure ? SOCKET_MAINTENANCE : SOCKET_DEAD);
 }
 
 static void socket_enter_signal(Socket *s, SocketState state, bool success);
@@ -995,12 +995,12 @@ static int socket_start(Unit *u) {
                 /* If the service is alredy actvie we cannot start the
                  * socket */
                 if (s->service->state != SERVICE_DEAD &&
-                    s->service->state != SERVICE_MAINTAINANCE &&
+                    s->service->state != SERVICE_MAINTENANCE &&
                     s->service->state != SERVICE_AUTO_RESTART)
                         return -EBUSY;
         }
 
-        assert(s->state == SOCKET_DEAD || s->state == SOCKET_MAINTAINANCE);
+        assert(s->state == SOCKET_DEAD || s->state == SOCKET_MAINTENANCE);
 
         s->failure = false;
         socket_enter_start_pre(s);
@@ -1331,7 +1331,7 @@ static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
                 break;
 
         case SOCKET_FINAL_SIGKILL:
-                log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", u->meta.id);
+                log_warning("%s still around after SIGKILL (2). Entering maintenance mode.", u->meta.id);
                 socket_enter_dead(s, false);
                 break;
 
@@ -1395,7 +1395,7 @@ static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
         [SOCKET_STOP_POST] = "stop-post",
         [SOCKET_FINAL_SIGTERM] = "final-sigterm",
         [SOCKET_FINAL_SIGKILL] = "final-sigkill",
-        [SOCKET_MAINTAINANCE] = "maintainance"
+        [SOCKET_MAINTENANCE] = "maintenance"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(socket_state, SocketState);

diff --git a/src/socket.h b/src/socket.h
index 2067eb425428be24f67a288909534df4bed0db28..5a2cd06d9d66a761c2df62421c0bfd00d3e64a10 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -41,7 +41,7 @@ typedef enum SocketState {
         SOCKET_STOP_POST,
         SOCKET_FINAL_SIGTERM,
         SOCKET_FINAL_SIGKILL,
-        SOCKET_MAINTAINANCE,
+        SOCKET_MAINTENANCE,
         _SOCKET_STATE_MAX,
         _SOCKET_STATE_INVALID = -1
 } SocketState;

diff --git a/src/swap.c b/src/swap.c
index c35a8e785a6708099c1eb9f8974a60dd06438d26..6c0322f3e53c926271915c136dc68cf68ea20b8e 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -37,7 +37,7 @@
 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
         [SWAP_DEAD] = UNIT_INACTIVE,
         [SWAP_ACTIVE] = UNIT_ACTIVE,
-        [SWAP_MAINTAINANCE] = UNIT_INACTIVE
+        [SWAP_MAINTENANCE] = UNIT_INACTIVE
 };
 
 static void swap_init(Unit *u) {
@@ -382,7 +382,7 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
 static void swap_enter_dead(Swap *s, bool success) {
         assert(s);
 
-        swap_set_state(s, success ? SWAP_MAINTAINANCE : SWAP_DEAD);
+        swap_set_state(s, success ? SWAP_MAINTENANCE : SWAP_DEAD);
 }
 
 static int swap_start(Unit *u) {
@@ -391,7 +391,7 @@ static int swap_start(Unit *u) {
         int r;
 
         assert(s);
-        assert(s->state == SWAP_DEAD || s->state == SWAP_MAINTAINANCE);
+        assert(s->state == SWAP_DEAD || s->state == SWAP_MAINTENANCE);
 
         if (s->from_fragment)
                 priority = s->parameters_fragment.priority;
@@ -527,7 +527,7 @@ static void swap_shutdown(Manager *m) {
 static const char* const swap_state_table[_SWAP_STATE_MAX] = {
         [SWAP_DEAD] = "dead",
         [SWAP_ACTIVE] = "active",
-        [SWAP_MAINTAINANCE] = "maintainance"
+        [SWAP_MAINTENANCE] = "maintenance"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(swap_state, SwapState);

diff --git a/src/swap.h b/src/swap.h
index f54a9ee4344e2b54ad25d440db3ae590fe3b1788..d3f24d5cbac50b9899a1de74b02c46b8ad85a916 100644 (file)
--- a/src/swap.h
+++ b/src/swap.h
@@ -30,7 +30,7 @@ typedef struct Swap Swap;
 typedef enum SwapState {
         SWAP_DEAD,
         SWAP_ACTIVE,
-        SWAP_MAINTAINANCE,
+        SWAP_MAINTENANCE,
         _SWAP_STATE_MAX,
         _SWAP_STATE_INVALID = -1
 } SwapState;

diff --git a/src/timer.c b/src/timer.c
index b025051f2b77a0d3000b45af545a9cd1a2542d3b..7bf2d1023892338488261ea23399d6a8dd385ded 100644 (file)
--- a/src/timer.c
+++ b/src/timer.c
@@ -31,7 +31,7 @@ static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
         [TIMER_WAITING] = UNIT_ACTIVE,
         [TIMER_RUNNING] = UNIT_ACTIVE,
         [TIMER_ELAPSED] = UNIT_ACTIVE,
-        [TIMER_MAINTAINANCE] = UNIT_INACTIVE
+        [TIMER_MAINTENANCE] = UNIT_INACTIVE
 };
 
 static void timer_init(Unit *u) {
@@ -167,7 +167,7 @@ static void timer_enter_dead(Timer *t, bool success) {
         if (!success)
                 t->failure = true;
 
-        timer_set_state(t, t->failure ? TIMER_MAINTAINANCE : TIMER_DEAD);
+        timer_set_state(t, t->failure ? TIMER_MAINTENANCE : TIMER_DEAD);
 }
 
 static void timer_enter_waiting(Timer *t, bool initial) {
@@ -273,7 +273,7 @@ static int timer_start(Unit *u) {
         Timer *t = TIMER(u);
 
         assert(t);
-        assert(t->state == TIMER_DEAD || t->state == TIMER_MAINTAINANCE);
+        assert(t->state == TIMER_DEAD || t->state == TIMER_MAINTENANCE);
 
         if (t->unit->meta.load_state != UNIT_LOADED)
                 return -ENOENT;
@@ -409,7 +409,7 @@ void timer_unit_notify(Unit *u, UnitActiveState new_state) {
                         break;
 
                 case TIMER_DEAD:
-                case TIMER_MAINTAINANCE:
+                case TIMER_MAINTENANCE:
                         ;
 
                 default:
@@ -428,7 +428,7 @@ static const char* const timer_state_table[_TIMER_STATE_MAX] = {
         [TIMER_WAITING] = "waiting",
         [TIMER_RUNNING] = "running",
         [TIMER_ELAPSED] = "elapsed",
-        [TIMER_MAINTAINANCE] = "maintainance"
+        [TIMER_MAINTENANCE] = "maintenance"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(timer_state, TimerState);

diff --git a/src/timer.h b/src/timer.h
index eb22688a3be3f61f4e2de2562f515992b9298548..6510ed2844a19ff73e3eddc1a18811ded6b1ace0 100644 (file)
--- a/src/timer.h
+++ b/src/timer.h
@@ -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;