chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup
[elogind.git]
/
src
/
core
/
swap.c
diff --git
a/src/core/swap.c
b/src/core/swap.c
index dc98f473871114cac7e5b558bc4111e988910c66..e7cc19596e8bb9a717cf564c4ad64489c9334292 100644
(file)
--- a/
src/core/swap.c
+++ b/
src/core/swap.c
@@
-214,7
+214,7
@@
static int swap_add_default_dependencies(Swap *s) {
static int swap_verify(Swap *s) {
bool b;
static int swap_verify(Swap *s) {
bool b;
-
char _cleanup_free_
*e = NULL;
+
_cleanup_free_ char
*e = NULL;
if (UNIT(s)->load_state != UNIT_LOADED)
return 0;
if (UNIT(s)->load_state != UNIT_LOADED)
return 0;
@@
-315,7
+315,7
@@
static int swap_add_one(
bool set_flags) {
Unit *u = NULL;
bool set_flags) {
Unit *u = NULL;
-
char _cleanup_free_
*e = NULL;
+
_cleanup_free_ char
*e = NULL;
char *wp = NULL;
bool delete = false;
int r;
char *wp = NULL;
bool delete = false;
int r;
@@
-1242,10
+1242,14
@@
static void swap_shutdown(Manager *m) {
static int swap_enumerate(Manager *m) {
int r;
static int swap_enumerate(Manager *m) {
int r;
- struct epoll_event ev;
assert(m);
if (!m->proc_swaps) {
assert(m);
if (!m->proc_swaps) {
+ struct epoll_event ev = {
+ .events = EPOLLPRI,
+ .data.ptr = &m->swap_watch,
+ };
+
m->proc_swaps = fopen("/proc/swaps", "re");
if (!m->proc_swaps)
return (errno == ENOENT) ? 0 : -errno;
m->proc_swaps = fopen("/proc/swaps", "re");
if (!m->proc_swaps)
return (errno == ENOENT) ? 0 : -errno;
@@
-1253,10
+1257,6
@@
static int swap_enumerate(Manager *m) {
m->swap_watch.type = WATCH_SWAP;
m->swap_watch.fd = fileno(m->proc_swaps);
m->swap_watch.type = WATCH_SWAP;
m->swap_watch.fd = fileno(m->proc_swaps);
- zero(ev);
- ev.events = EPOLLPRI;
- ev.data.ptr = &m->swap_watch;
-
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->swap_watch.fd, &ev) < 0)
return -errno;
}
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->swap_watch.fd, &ev) < 0)
return -errno;
}