chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared/capabilities: simplify assertions about bits
[elogind.git]
/
src
/
shared
/
exit-status.c
diff --git
a/src/shared/exit-status.c
b/src/shared/exit-status.c
index 38d71e182dab97760f141e351dc82638edbb02ce..5c73b4d3c0d1384c27e6edf748d8fa2cf162d357 100644
(file)
--- a/
src/shared/exit-status.c
+++ b/
src/shared/exit-status.c
@@
-148,6
+148,9
@@
const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
case EXIT_MAKE_STARTER:
return "MAKE_STARTER";
case EXIT_MAKE_STARTER:
return "MAKE_STARTER";
+
+ case EXIT_BUS_ENDPOINT:
+ return "BUS_ENDPOINT";
}
}
}
}
@@
-183,7
+186,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 */
@@
-212,7
+215,14
@@
bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status) {
void exit_status_set_free(ExitStatusSet *x) {
assert(x);
void exit_status_set_free(ExitStatusSet *x) {
assert(x);
- set_free(x->
code
);
+ set_free(x->
status
);
set_free(x->signal);
set_free(x->signal);
- x->code = x->signal = NULL;
+ x->status = x->signal = NULL;
+}
+
+bool exit_status_set_is_empty(ExitStatusSet *x) {
+ if (!x)
+ return true;
+
+ return set_isempty(x->status) && set_isempty(x->signal);
}
}