chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use first partition in /proc/swaps for hibernation test
[elogind.git]
/
src
/
core
/
swap.c
diff --git
a/src/core/swap.c
b/src/core/swap.c
index 76c7d4500641b9b5cd574b41f3e770bdfe33b9fd..82bfad187e43bb6bd5e0fe84177e69bd27c4228d 100644
(file)
--- a/
src/core/swap.c
+++ b/
src/core/swap.c
@@
-1074,7
+1074,7
@@
static int swap_load_proc_swaps(Manager *m, bool set_flags) {
(void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n");
for (i = 1;; i++) {
(void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n");
for (i = 1;; i++) {
-
char *dev = NULL, *d
;
+
_cleanup_free_ char *dev = NULL, *d = NULL
;
int prio = 0, k;
k = fscanf(m->proc_swaps,
int prio = 0, k;
k = fscanf(m->proc_swaps,
@@
-1089,19
+1089,14
@@
static int swap_load_proc_swaps(Manager *m, bool set_flags) {
break;
log_warning("Failed to parse /proc/swaps:%u", i);
break;
log_warning("Failed to parse /proc/swaps:%u", i);
- free(dev);
continue;
}
d = cunescape(dev);
continue;
}
d = cunescape(dev);
- free(dev);
-
if (!d)
return -ENOMEM;
k = swap_process_new_swap(m, d, prio, set_flags);
if (!d)
return -ENOMEM;
k = swap_process_new_swap(m, d, prio, set_flags);
- free(d);
-
if (k < 0)
r = k;
}
if (k < 0)
r = k;
}