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=38d71e182dab97760f141e351dc82638edbb02ce;hpb=37520c1bec9a92adbe02fceaece588a7aa2fea2b;p=elogind.git diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c index 38d71e182..f3434f7cc 100644 --- a/src/shared/exit-status.c +++ b/src/shared/exit-status.c @@ -183,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 */ @@ -212,7 +212,14 @@ bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status) { void exit_status_set_free(ExitStatusSet *x) { assert(x); - set_free(x->code); + set_free(x->status); 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); }