chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
job: optionally, when a job timeout is hit, also execute a failure action
[elogind.git]
/
src
/
core
/
busname.h
diff --git
a/src/core/busname.h
b/src/core/busname.h
index 65d57f710a7745dbd3583623f3828e947abd6ce0..c9b653d82e6081389e801fa5b0afc3090cde7404 100644
(file)
--- a/
src/core/busname.h
+++ b/
src/core/busname.h
@@
-25,6
+25,7
@@
typedef struct BusName BusName;
typedef struct BusNamePolicy BusNamePolicy;
#include "unit.h"
typedef struct BusNamePolicy BusNamePolicy;
#include "unit.h"
+#include "bus-common.h"
typedef enum BusNameState {
BUSNAME_DEAD,
typedef enum BusNameState {
BUSNAME_DEAD,
@@
-58,17
+59,9
@@
typedef enum BusNamePolicyType {
_BUSNAME_POLICY_TYPE_INVALID = -1
} BusNamePolicyType;
_BUSNAME_POLICY_TYPE_INVALID = -1
} BusNamePolicyType;
-typedef enum BusNamePolicyAccess {
- BUSNAME_POLICY_ACCESS_SEE,
- BUSNAME_POLICY_ACCESS_TALK,
- BUSNAME_POLICY_ACCESS_OWN,
- _BUSNAME_POLICY_ACCESS_MAX,
- _BUSNAME_POLICY_ACCESS_INVALID = -1
-} BusNamePolicyAccess;
-
struct BusNamePolicy {
BusNamePolicyType type;
struct BusNamePolicy {
BusNamePolicyType type;
- Bus
Name
PolicyAccess access;
+ BusPolicyAccess access;
char *name;
char *name;
@@
-97,7
+90,7
@@
struct BusName {
pid_t control_pid;
LIST_HEAD(BusNamePolicy, policy);
pid_t control_pid;
LIST_HEAD(BusNamePolicy, policy);
- Bus
Name
PolicyAccess policy_world;
+ BusPolicyAccess policy_world;
};
extern const UnitVTable busname_vtable;
};
extern const UnitVTable busname_vtable;
@@
-107,6
+100,3
@@
BusNameState busname_state_from_string(const char *s) _pure_;
const char* busname_result_to_string(BusNameResult i) _const_;
BusNameResult busname_result_from_string(const char *s) _pure_;
const char* busname_result_to_string(BusNameResult i) _const_;
BusNameResult busname_result_from_string(const char *s) _pure_;
-
-const char* busname_policy_access_to_string(BusNamePolicyAccess i) _const_;
-BusNamePolicyAccess busname_policy_access_from_string(const char *s) _pure_;