From a7fa81f2960e73e6771ee0eb4fd071c28a79b2e7 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 22 Feb 2023 00:28:06 +0100 Subject: [PATCH] btrfs-progs: open code print_usage where applicable After previous change to usage() that now has the return code, there's no purpose of the print_usage() wrapper so it can be removed. Signed-off-by: David Sterba --- image/main.c | 13 ++++--------- mkfs/main.c | 9 ++------- tune/main.c | 9 ++------- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/image/main.c b/image/main.c index addd5e5e..9df6e52e 100644 --- a/image/main.c +++ b/image/main.c @@ -3050,11 +3050,6 @@ static const struct cmd_struct image_cmd = { .usagestr = image_usage }; -static void print_usage(int ret) -{ - usage(&image_cmd, ret); -} - int BOX_MAIN(image)(int argc, char *argv[]) { char *source; @@ -3125,13 +3120,13 @@ int BOX_MAIN(image)(int argc, char *argv[]) break; case GETOPT_VAL_HELP: default: - print_usage(c != GETOPT_VAL_HELP); + usage(&image_cmd, c != GETOPT_VAL_HELP); } } set_argv0(argv); if (check_argc_min(argc - optind, 2)) - print_usage(1); + usage(&image_cmd, 1); dev_cnt = argc - optind - 1; @@ -3139,7 +3134,7 @@ int BOX_MAIN(image)(int argc, char *argv[]) if (dump_data) { error( "data dump feature is experimental and is not configured in this build"); - print_usage(1); + usage(&image_cmd, 1); } #endif if (create) { @@ -3170,7 +3165,7 @@ int BOX_MAIN(image)(int argc, char *argv[]) } if (usage_error) - print_usage(1); + usage(&image_cmd, 1); source = argv[optind]; target = argv[optind + 1]; diff --git a/mkfs/main.c b/mkfs/main.c index aa570fec..f5e34cbd 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -447,11 +447,6 @@ static const struct cmd_struct mkfs_cmd = { .usagestr = mkfs_usage }; -static void print_usage(int ret) -{ - usage(&mkfs_cmd, ret); -} - static int zero_output_file(int out_fd, u64 size) { int loop_num; @@ -1202,7 +1197,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) break; case GETOPT_VAL_HELP: default: - print_usage(c != GETOPT_VAL_HELP); + usage(&mkfs_cmd, c != GETOPT_VAL_HELP); } } @@ -1223,7 +1218,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) saved_optind = optind; device_count = argc - optind; if (device_count == 0) - print_usage(1); + usage(&mkfs_cmd, 1); opt_zoned = !!(features.incompat_flags & BTRFS_FEATURE_INCOMPAT_ZONED); diff --git a/tune/main.c b/tune/main.c index 5b063976..c5d2e37a 100644 --- a/tune/main.c +++ b/tune/main.c @@ -93,11 +93,6 @@ static const struct cmd_struct tune_cmd = { .usagestr = tune_usage }; -static void print_usage(int ret) -{ - usage(&tune_cmd, ret); -} - int BOX_MAIN(btrfstune)(int argc, char *argv[]) { struct btrfs_root *root; @@ -182,7 +177,7 @@ int BOX_MAIN(btrfstune)(int argc, char *argv[]) #endif case GETOPT_VAL_HELP: default: - print_usage(c != GETOPT_VAL_HELP); + usage(&tune_cmd, c != GETOPT_VAL_HELP); } } @@ -198,7 +193,7 @@ int BOX_MAIN(btrfstune)(int argc, char *argv[]) if (!super_flags && !seeding_flag && !(random_fsid || new_fsid_str) && !change_metadata_uuid && csum_type == -1 && !to_bg_tree) { error("at least one option should be specified"); - print_usage(1); + usage(&tune_cmd, 1); return 1; }