chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consistently order cleanup attribute before type
[elogind.git]
/
src
/
shared
/
exit-status.h
diff --git
a/src/shared/exit-status.h
b/src/shared/exit-status.h
index 813f1ce1b4a236a9e7fc4cc5b3bff77f928a36a4..57d066f155d178ed7865d8b15037c67189758e86 100644
(file)
--- a/
src/shared/exit-status.h
+++ b/
src/shared/exit-status.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooexitstatushfoo
-#define fooexitstatushfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-24,6
+23,8
@@
#include <stdbool.h>
#include <stdbool.h>
+#include "set.h"
+
typedef enum ExitStatus {
/* EXIT_SUCCESS defined by libc */
/* EXIT_FAILURE defined by libc */
typedef enum ExitStatus {
/* EXIT_SUCCESS defined by libc */
/* EXIT_FAILURE defined by libc */
@@
-63,12
+64,19
@@
typedef enum ExitStatus {
EXIT_SETSID, /* 220 */
EXIT_CONFIRM,
EXIT_STDERR,
EXIT_SETSID, /* 220 */
EXIT_CONFIRM,
EXIT_STDERR,
- EXIT_TCPWRAP,
+ _EXIT_RESERVED, /* used to be tcpwrap, don't reuse! */
EXIT_PAM,
EXIT_NETWORK,
EXIT_NAMESPACE,
EXIT_NO_NEW_PRIVILEGES,
EXIT_PAM,
EXIT_NETWORK,
EXIT_NAMESPACE,
EXIT_NO_NEW_PRIVILEGES,
- EXIT_SECCOMP
+ EXIT_SECCOMP,
+ EXIT_SELINUX_CONTEXT,
+ EXIT_PERSONALITY, /* 230 */
+ EXIT_APPARMOR_PROFILE,
+ EXIT_ADDRESS_FAMILIES,
+ EXIT_RUNTIME_DIRECTORY,
+ EXIT_MAKE_STARTER,
+ EXIT_CHOWN,
} ExitStatus;
typedef enum ExitStatusLevel {
} ExitStatus;
typedef enum ExitStatusLevel {
@@
-78,9
+86,12
@@
typedef enum ExitStatusLevel {
EXIT_STATUS_FULL = EXIT_STATUS_LSB
} ExitStatusLevel;
EXIT_STATUS_FULL = EXIT_STATUS_LSB
} ExitStatusLevel;
-const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level);
+typedef struct ExitStatusSet {
+ Set *code;
+ Set *signal;
+} ExitStatusSet;
-bool is_clean_exit(int code, int status);
-bool is_clean_exit_lsb(int code, int status);
+const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) _const_;
-#endif
+bool is_clean_exit(int code, int status, ExitStatusSet *success_status);
+bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status);