chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
coredump: simplify a few things by allocating small fields on the stack rather than...
[elogind.git]
/
src
/
core
/
umount.c
diff --git
a/src/core/umount.c
b/src/core/umount.c
index a30f6740fada15b5b00214ede9e2173b0517ffe4..e38851dc125fbc51906712d499fbb85c7bf01713 100644
(file)
--- a/
src/core/umount.c
+++ b/
src/core/umount.c
@@
-126,9
+126,8
@@
static int mount_points_list_get(MountPoint **head) {
}
static int swap_list_get(MountPoint **head) {
}
static int swap_list_get(MountPoint **head) {
-
FILE *proc_swaps
;
+
_cleanup_fclose_ FILE *proc_swaps = NULL
;
unsigned int i;
unsigned int i;
- int r;
assert(head);
assert(head);
@@
-168,26
+167,19
@@
static int swap_list_get(MountPoint **head) {
free(dev);
if (!d) {
free(dev);
if (!d) {
- r = -ENOMEM;
- goto finish;
+ return -ENOMEM;
}
if (!(swap = new0(MountPoint, 1))) {
free(d);
}
if (!(swap = new0(MountPoint, 1))) {
free(d);
- r = -ENOMEM;
- goto finish;
+ return -ENOMEM;
}
swap->path = d;
LIST_PREPEND(mount_point, *head, swap);
}
}
swap->path = d;
LIST_PREPEND(mount_point, *head, swap);
}
- r = 0;
-
-finish:
- fclose(proc_swaps);
-
- return r;
+ return 0;
}
static int loopback_list_get(MountPoint **head) {
}
static int loopback_list_get(MountPoint **head) {
@@
-409,7
+401,7
@@
static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
mount_point_free(head, m);
} else if (log_error) {
mount_point_free(head, m);
} else if (log_error) {
- log_warning
(
"Could not unmount %s: %m", m->path);
+ log_warning
_errno(errno,
"Could not unmount %s: %m", m->path);
n_failed++;
}
}
n_failed++;
}
}
@@
-431,7
+423,7
@@
static int swap_points_list_off(MountPoint **head, bool *changed) {
mount_point_free(head, m);
} else {
mount_point_free(head, m);
} else {
- log_warning
(
"Could not deactivate swap %s: %m", m->path);
+ log_warning
_errno(errno,
"Could not deactivate swap %s: %m", m->path);
n_failed++;
}
}
n_failed++;
}
}
@@
-468,7
+460,7
@@
static int loopback_points_list_detach(MountPoint **head, bool *changed) {
mount_point_free(head, m);
} else {
mount_point_free(head, m);
} else {
- log_warning
(
"Could not detach loopback %s: %m", m->path);
+ log_warning
_errno(errno,
"Could not detach loopback %s: %m", m->path);
n_failed++;
}
}
n_failed++;
}
}
@@
-503,7
+495,7
@@
static int dm_points_list_detach(MountPoint **head, bool *changed) {
mount_point_free(head, m);
} else {
mount_point_free(head, m);
} else {
- log_warning
(
"Could not detach DM %s: %m", m->path);
+ log_warning
_errno(errno,
"Could not detach DM %s: %m", m->path);
n_failed++;
}
}
n_failed++;
}
}