X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fexit-status.c;h=f3434f7ccc3b5264952eed25b9e43f6a7118a4d7;hb=a1948c7bfeb87b54bc7715a44490c01593ee6e23;hp=c1b04a38688cd96055f74c39a4a1555552ab3da5;hpb=4298d0b5128326621c8f537107c4c8b459490721;p=elogind.git

diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
index c1b04a386..f3434f7cc 100644
--- a/src/shared/exit-status.c
+++ b/src/shared/exit-status.c
@@ -113,9 +113,6 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
                 case EXIT_STDERR:
                         return "STDERR";
 
-                case EXIT_TCPWRAP:
-                        return "TCPWRAP";
-
                 case EXIT_PAM:
                         return "PAM";
 
@@ -142,6 +139,15 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
 
                 case EXIT_ADDRESS_FAMILIES:
                         return "ADDRESS_FAMILIES";
+
+                case EXIT_RUNTIME_DIRECTORY:
+                        return "RUNTIME_DIRECTORY";
+
+                case EXIT_CHOWN:
+                        return "CHOWN";
+
+                case EXIT_MAKE_STARTER:
+                        return "MAKE_STARTER";
                 }
         }
 
@@ -177,7 +183,7 @@ bool is_clean_exit(int code, int status, ExitStatusSet *success_status) {
         if (code == CLD_EXITED)
                 return status == 0 ||
                        (success_status &&
-                       set_contains(success_status->code, INT_TO_PTR(status)));
+                       set_contains(success_status->status, INT_TO_PTR(status)));
 
         /* If a daemon does not implement handlers for some of the
          * signals that's not considered an unclean shutdown */
@@ -203,19 +209,17 @@ bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status) {
                 (status == EXIT_NOTINSTALLED || status == EXIT_NOTCONFIGURED);
 }
 
-int parse_show_status(const char *v, ShowStatus *ret) {
-        int r;
+void exit_status_set_free(ExitStatusSet *x) {
+        assert(x);
 
-        assert(v);
-        assert(ret);
+        set_free(x->status);
+        set_free(x->signal);
+        x->status = x->signal = NULL;
+}
 
-        if (streq(v, "auto")) {
-                *ret = SHOW_STATUS_AUTO;
-                return 0;
-        }
-        r = parse_boolean(v);
-        if (r < 0)
-                return r;
-        *ret = r ? SHOW_STATUS_YES : SHOW_STATUS_NO;
-        return 0;
+bool exit_status_set_is_empty(ExitStatusSet *x) {
+        if (!x)
+                return true;
+
+        return set_isempty(x->status) && set_isempty(x->signal);
 }