alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed format args and removed unnecessary strdup()s

Browse Source
This commit is contained in:
Tim Schlueter 2018-11-04 23:23:11 -08:00
parent ff2a414ccc
commit f2665657cf
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd_format.c
View File

@ -87,7 +87,7 @@ static void usage(void)
" --replicas=# Sets both data and metadata replicas\n" " --replicas=# Sets both data and metadata replicas\n"
" --encrypted Enable whole filesystem encryption (chacha20/poly1305)\n" " --encrypted Enable whole filesystem encryption (chacha20/poly1305)\n"
" --no_passphrase Don't encrypt master encryption key\n" " --no_passphrase Don't encrypt master encryption key\n"
" --error_action=(continue|remount-ro|panic)\n" " -e, --error_action=(continue|remount-ro|panic)\n"
" Action to take on filesystem error\n" " Action to take on filesystem error\n"
" -L, --label=label\n" " -L, --label=label\n"
" -U, --uuid=uuid\n" " -U, --uuid=uuid\n"
@ -153,7 +153,7 @@ int cmd_format(int argc, char *argv[])
darray_init(devices); darray_init(devices);
while ((opt = getopt_long(argc, argv, while ((opt = getopt_long(argc, argv,
"-b:e:L:U:ft:qh", "-b:e:g:L:U:fqh",
format_opts, format_opts,
NULL)) != -1) NULL)) != -1)
switch (opt) { switch (opt) {
@ -208,13 +208,13 @@ int cmd_format(int argc, char *argv[])
opts.meta_replicas = opts.data_replicas; opts.meta_replicas = opts.data_replicas;
break; break;
case O_foreground_target: case O_foreground_target:
opts.foreground_target = strdup(optarg); opts.foreground_target = optarg;
break; break;
case O_background_target: case O_background_target:
opts.background_target = strdup(optarg); opts.background_target = optarg;
break; break;
case O_promote_target: case O_promote_target:
opts.promote_target = strdup(optarg); opts.promote_target = optarg;
break; break;
case O_encrypted: case O_encrypted:
opts.encrypted = true; opts.encrypted = true;
@ -230,7 +230,7 @@ int cmd_format(int argc, char *argv[])
break; break;
case O_label: case O_label:
case 'L': case 'L':
opts.label = strdup(optarg); opts.label = optarg;
break; break;
case O_uuid: case O_uuid:
case 'U': case 'U':
@ -253,7 +253,7 @@ int cmd_format(int argc, char *argv[])
break; break;
case O_group: case O_group:
case 'g': case 'g':
dev_opts.group = strdup(optarg); dev_opts.group = optarg;
break; break;
case O_discard: case O_discard:
dev_opts.discard = true; dev_opts.discard = true;
@ -269,7 +269,7 @@ int cmd_format(int argc, char *argv[])
die("invalid durability"); die("invalid durability");
break; break;
case O_no_opt: case O_no_opt:
dev_opts.path = strdup(optarg); dev_opts.path = optarg;
darray_append(devices, dev_opts); darray_append(devices, dev_opts);
dev_opts.size = 0; dev_opts.size = 0;
break; break;
@ -284,7 +284,7 @@ int cmd_format(int argc, char *argv[])
break; break;
} }
if (!darray_size(devices)) if (darray_empty(devices))
die("Please supply a device"); die("Please supply a device");
if (opts.encrypted && !no_passphrase) if (opts.encrypted && !no_passphrase)
@ -305,6 +305,8 @@ int cmd_format(int argc, char *argv[])
free(opts.passphrase); free(opts.passphrase);
} }
darray_free(devices);
return 0; return 0;
} }