chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit-status: rename ExitStatusSet's "code" field to "status"
[elogind.git]
/
src
/
shared
/
exit-status.c
diff --git
a/src/shared/exit-status.c
b/src/shared/exit-status.c
index c1c0861168dfb3eed3d6e570735f7755adaacca1..942ac86128be814a384be4801d1dc3c77df938b9 100644
(file)
--- 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_STDERR:
return "STDERR";
- case EXIT_TCPWRAP:
- return "TCPWRAP";
-
case EXIT_PAM:
return "PAM";
case EXIT_PAM:
return "PAM";
@@
-145,6
+142,12
@@
const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
case EXIT_RUNTIME_DIRECTORY:
return "RUNTIME_DIRECTORY";
case EXIT_RUNTIME_DIRECTORY:
return "RUNTIME_DIRECTORY";
+
+ case EXIT_CHOWN:
+ return "CHOWN";
+
+ case EXIT_MAKE_STARTER:
+ return "MAKE_STARTER";
}
}
}
}
@@
-180,7
+183,7
@@
bool is_clean_exit(int code, int status, ExitStatusSet *success_status) {
if (code == CLD_EXITED)
return status == 0 ||
(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 */
/* If a daemon does not implement handlers for some of the
* signals that's not considered an unclean shutdown */
@@
-206,19
+209,10
@@
bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status) {
(status == EXIT_NOTINSTALLED || status == EXIT_NOTCONFIGURED);
}
(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);
-
- 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;
+ set_free(x->status);
+ set_free(x->signal);
+ x->status = x->signal = NULL;
}
}