shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

repart: Make parse_filter_partitions() more generic

Browse Source
This commit is contained in:
Daan De Meyer 2022-11-22 14:03:54 +01:00
parent d989dd7631
commit 220780db86
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/partition/repart.c
View File

@ -5333,9 +5333,12 @@ static int context_minimize(Context *context) {
return 0;
}
static int parse_filter_partitions(const char *p) {
static int parse_partition_types(const char *p, sd_id128_t **partitions, size_t *n_partitions) {
int r;
assert(partitions);
assert(n_partitions);
for (;;) {
_cleanup_free_ char *name = NULL;
GptPartitionType type;
@ -5350,10 +5353,10 @@ static int parse_filter_partitions(const char *p) {
if (r < 0)
return log_error_errno(r, "'%s' is not a valid partition type identifier or GUID", name);
if (!GREEDY_REALLOC(arg_filter_partitions, arg_n_filter_partitions + 1))
if (!GREEDY_REALLOC(*partitions, *n_partitions + 1))
return log_oom();
arg_filter_partitions[arg_n_filter_partitions++] = type.uuid;
(*partitions)[(*n_partitions)++] = type.uuid;
}
return 0;
@ -5730,7 +5733,7 @@ static int parse_argv(int argc, char *argv[]) {
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Combination of --include-partitions= and --exclude-partitions= is invalid.");
r = parse_filter_partitions(optarg);
r = parse_partition_types(optarg, &arg_filter_partitions, &arg_n_filter_partitions);
if (r < 0)
return r;
@ -5743,7 +5746,7 @@ static int parse_argv(int argc, char *argv[]) {
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Combination of --include-partitions= and --exclude-partitions= is invalid.");
r = parse_filter_partitions(optarg);
r = parse_partition_types(optarg, &arg_filter_partitions, &arg_n_filter_partitions);
if (r < 0)
return r;