chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: move ManagerRunningAs to shared
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 653496ded03039b91bafaae19fcf4c31126735b4..913752f9ef68c473bcec20e76812b9dabb5773e8 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-49,13
+49,6
@@
typedef enum ManagerExitCode {
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
-typedef enum ManagerRunningAs {
- MANAGER_SYSTEM,
- MANAGER_USER,
- _MANAGER_RUNNING_AS_MAX,
- _MANAGER_RUNNING_AS_INVALID = -1
-} ManagerRunningAs;
-
enum WatchType {
WATCH_INVALID,
WATCH_SIGNAL,
enum WatchType {
WATCH_INVALID,
WATCH_SIGNAL,
@@
-213,7
+206,7
@@
struct Manager {
#endif
/* Flags */
#endif
/* Flags */
-
Manager
RunningAs running_as;
+
Systemd
RunningAs running_as;
ManagerExitCode exit_code:5;
bool dispatching_load_queue:1;
ManagerExitCode exit_code:5;
bool dispatching_load_queue:1;
@@
-242,7
+235,7
@@
struct Manager {
char *switch_root_init;
};
char *switch_root_init;
};
-int manager_new(
Manager
RunningAs running_as, Manager **m);
+int manager_new(
Systemd
RunningAs running_as, Manager **m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
@@
-303,6
+296,3
@@
void manager_recheck_journal(Manager *m);
void manager_set_show_status(Manager *m, bool b);
bool manager_get_show_status(Manager *m);
void manager_set_show_status(Manager *m, bool b);
bool manager_get_show_status(Manager *m);
-
-const char *manager_running_as_to_string(ManagerRunningAs i);
-ManagerRunningAs manager_running_as_from_string(const char *s);