dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-26 03:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/umount: use structured initializers

Browse Source
This commit is contained in:
Yu Watanabe
2018-09-01 23:04:42 +09:00
parent 8437c0593f
commit 209c6f03bc
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/umount.c
View File

@@ -256,22 +256,26 @@ static int loopback_list_get(MountPoint **head) {
return r;
FOREACH_DEVICE(e, d) {
_cleanup_free_ MountPoint *lb = NULL;
_cleanup_free_ char *p = NULL;
const char *dn;
MountPoint *lb;
if (sd_device_get_devname(d, &dn) < 0)
continue;
lb = new0(MountPoint, 1);
p = strdup(dn);
if (!p)
return -ENOMEM;
lb = new(MountPoint, 1);
if (!lb)
return -ENOMEM;
r = free_and_strdup(&lb->path, dn);
if (r < 0)
return r;
*lb = (MountPoint) {
.path = TAKE_PTR(p),
};
LIST_PREPEND(mount_point, *head, lb);
lb = NULL;
}
return 0;
@@ -301,27 +305,29 @@ static int dm_list_get(MountPoint **head) {
return r;
FOREACH_DEVICE(e, d) {
_cleanup_free_ MountPoint *m = NULL;
_cleanup_free_ char *p = NULL;
const char *dn;
MountPoint *m;
dev_t devnum;
if (sd_device_get_devnum(d, &devnum) < 0)
if (sd_device_get_devnum(d, &devnum) < 0 ||
sd_device_get_devname(d, &dn) < 0)
continue;
if (sd_device_get_devname(d, &dn) < 0)
continue;
p = strdup(dn);
if (!p)
return -ENOMEM;
m = new0(MountPoint, 1);
m = new(MountPoint, 1);
if (!m)
return -ENOMEM;
m->devnum = devnum;
r = free_and_strdup(&m->path, dn);
if (r < 0)
return r;
*m = (MountPoint) {
.path = TAKE_PTR(p),
.devnum = devnum,
};
LIST_PREPEND(mount_point, *head, m);
m = NULL;
}
return 0;