summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-03 15:36:50 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-03 15:37:46 +0200
commit3e2d435b3d2247a60d6def932d28a4856566a7d7 (patch)
tree6373008fa09233ebb0d326cea55acc6df8c4dee4 /src/shared
parentab016c45a96bad3fe799ce5d680dbecf3878470b (diff)
exit-status: rename ExitStatusSet's "code" field to "status"
We should follow the naming scheme waitid() uses, not come up with our own reversed one...
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/exit-status.c6
-rw-r--r--src/shared/exit-status.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
index 38d71e182d..942ac86128 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,7 @@ 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;
}
diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h
index 93abf7f10e..744f2d5376 100644
--- a/src/shared/exit-status.h
+++ b/src/shared/exit-status.h
@@ -87,7 +87,7 @@ typedef enum ExitStatusLevel {
} ExitStatusLevel;
typedef struct ExitStatusSet {
- Set *code;
+ Set *status;
Set *signal;
} ExitStatusSet;