chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit-printf: before resolving exec context specifiers check whether the object actual...
[elogind.git]
/
src
/
core
/
swap.h
diff --git
a/src/core/swap.h
b/src/core/swap.h
index 5c0ef73026cb81b4b2f6d3968fd9f9c6fc63fdc0..35d47fd46f5e87f769221a06726fa654d4127515 100644
(file)
--- a/
src/core/swap.h
+++ b/
src/core/swap.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 fooswaphfoo
-#define fooswaphfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-53,7
+52,6
@@
typedef struct SwapParameters {
int priority;
bool noauto:1;
bool nofail:1;
int priority;
bool noauto:1;
bool nofail:1;
- bool handle:1;
} SwapParameters;
typedef enum SwapResult {
} SwapParameters;
typedef enum SwapResult {
@@
-72,11
+70,9
@@
struct Swap {
char *what;
char *what;
- SwapParameters parameters_etc_fstab;
SwapParameters parameters_proc_swaps;
SwapParameters parameters_fragment;
SwapParameters parameters_proc_swaps;
SwapParameters parameters_fragment;
- bool from_etc_fstab:1;
bool from_proc_swaps:1;
bool from_fragment:1;
bool from_proc_swaps:1;
bool from_fragment:1;
@@
-91,6
+87,7
@@
struct Swap {
ExecCommand exec_command[_SWAP_EXEC_COMMAND_MAX];
ExecContext exec_context;
ExecCommand exec_command[_SWAP_EXEC_COMMAND_MAX];
ExecContext exec_context;
+ KillContext kill_context;
SwapState state, deserialized_state;
SwapState state, deserialized_state;
@@
-109,8
+106,6
@@
struct Swap {
extern const UnitVTable swap_vtable;
extern const UnitVTable swap_vtable;
-int swap_add_one(Manager *m, const char *what, const char *what_proc_swaps, int prio, bool no_auto, bool no_fail, bool handle, bool set_flags);
-
int swap_add_one_mount_link(Swap *s, Mount *m);
int swap_dispatch_reload(Manager *m);
int swap_add_one_mount_link(Swap *s, Mount *m);
int swap_dispatch_reload(Manager *m);
@@
-124,5
+119,3
@@
SwapExecCommand swap_exec_command_from_string(const char *s);
const char* swap_result_to_string(SwapResult i);
SwapResult swap_result_from_string(const char *s);
const char* swap_result_to_string(SwapResult i);
SwapResult swap_result_from_string(const char *s);
-
-#endif