morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

mkfs-util: Shorten strv operations error handling

Browse Source
This commit is contained in:
Daan De Meyer
2023-01-17 19:49:15 +01:00
parent 218cfe2335
commit 065bdb6f0f
1 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/shared/mkfs-util.c
View File

@@ -175,13 +175,11 @@ static int do_mcopy(const char *node, const char *root) {
continue;
}
r = strv_consume(&argv, TAKE_PTR(p));
if (r < 0)
if (strv_consume(&argv, TAKE_PTR(p)) < 0)
return log_oom();
}
r = strv_extend(&argv, "::");
if (r < 0)
if (strv_extend(&argv, "::") < 0)
return log_oom();
if (fstat(rfd, &st) < 0)
@@ -403,11 +401,8 @@ int make_filesystem(
if (!argv)
return log_oom();
if (root) {
r = strv_extend_strv(&argv, STRV_MAKE("-d", root), false);
if (r < 0)
return log_oom();
}
if (root && strv_extend_strv(&argv, STRV_MAKE("-d", root), false) < 0)
return log_oom();
} else if (STR_IN_SET(fstype, "ext3", "ext4")) {
argv = strv_new(mkfs,
@@ -420,11 +415,8 @@ int make_filesystem(
"-E", discard ? "discard,lazy_itable_init=1" : "nodiscard,lazy_itable_init=1",
node);
if (root) {
r = strv_extend_strv(&argv, STRV_MAKE("-d", root), false);
if (r < 0)
return log_oom();
}
if (root && strv_extend_strv(&argv, STRV_MAKE("-d", root), false) < 0)
return log_oom();
} else if (streq(fstype, "btrfs")) {
argv = strv_new(mkfs,
@@ -435,17 +427,11 @@ int make_filesystem(
if (!argv)
return log_oom();
if (!discard) {
r = strv_extend(&argv, "--nodiscard");
if (r < 0)
return log_oom();
}
if (!discard && strv_extend(&argv, "--nodiscard") < 0)
return log_oom();
if (root) {
r = strv_extend_strv(&argv, STRV_MAKE("-r", root), false);
if (r < 0)
return log_oom();
}
if (root && strv_extend_strv(&argv, STRV_MAKE("-r", root), false) < 0)
return log_oom();
} else if (streq(fstype, "f2fs")) {
argv = strv_new(mkfs,
@@ -471,19 +457,15 @@ int make_filesystem(
if (!argv)
return log_oom();
if (!discard) {
r = strv_extend(&argv, "-K");
if (r < 0)
return log_oom();
}
if (!discard && strv_extend(&argv, "-K") < 0)
return log_oom();
if (root) {
r = make_protofile(root, &protofile);
if (r < 0)
return r;
r = strv_extend_strv(&argv, STRV_MAKE("-p", protofile), false);
if (r < 0)
if (strv_extend_strv(&argv, STRV_MAKE("-p", protofile), false) < 0)
return log_oom();
}
@@ -523,11 +505,8 @@ int make_filesystem(
if (!argv)
return log_oom();
if (extra_mkfs_args) {
r = strv_extend_strv(&argv, extra_mkfs_args, false);
if (r < 0)
return log_oom();
}
if (extra_mkfs_args && strv_extend_strv(&argv, extra_mkfs_args, false) < 0)
return log_oom();
if (root && stat(root, &st) < 0)
return log_error_errno(errno, "Failed to stat %s: %m", root);