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: rework how we match mount units against each other
[elogind.git]
/
src
/
core
/
swap.h
diff --git
a/src/core/swap.h
b/src/core/swap.h
index 62d08da30b81f5649e4af04d1254d875df650894..dd89535895dd53e5af86cb71a90088e56a0387f0 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.
@@
-10,16
+9,16
@@
Copyright 2010 Maarten Lankhorst
systemd is free software; you can redistribute it and/or modify it
Copyright 2010 Maarten Lankhorst
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU
Lesser
General Public License as published by
+ the Free Software Foundation; either version 2
.1
of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+
Lesser
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU
Lesser
General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
@@
-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,8
@@
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;
+ CGroupContext cgroup_context;
SwapState state, deserialized_state;
SwapState state, deserialized_state;
@@
-109,20
+107,14
@@
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_fd_event(Manager *m, int events);
int swap_dispatch_reload(Manager *m);
int swap_fd_event(Manager *m, int events);
-const char* swap_state_to_string(SwapState i);
-SwapState swap_state_from_string(const char *s);
-
-const char* swap_exec_command_to_string(SwapExecCommand i);
-SwapExecCommand swap_exec_command_from_string(const char *s);
+const char* swap_state_to_string(SwapState i) _const_;
+SwapState swap_state_from_string(const char *s) _pure_;
-const char* swap_
result_to_string(SwapResult i)
;
-Swap
Result swap_result_from_string(const char *s)
;
+const char* swap_
exec_command_to_string(SwapExecCommand i) _const_
;
+Swap
ExecCommand swap_exec_command_from_string(const char *s) _pure_
;
-#endif
+const char* swap_result_to_string(SwapResult i) _const_;
+SwapResult swap_result_from_string(const char *s) _pure_;