diff options
author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-10-29 17:31:48 +0800 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2015-11-02 15:10:14 +0100 |
commit | c9bddcacbc6cad10e65a305e9382648346bbe896 (patch) | |
tree | ee637492d22587c8ec3613571a1bd41d36626bf2 /btrfs.c | |
parent | eccf7aa62e638c627c05852cf5cac5ad0c951279 (diff) | |
download | btrfs-progs-c9bddcacbc6cad10e65a305e9382648346bbe896.tar.gz |
btrfs-progs: Avoid use pointer in handle_options
We use pointer of argc and argv in handle_options() because they
are necessary in very old code which are not exist now.
This patch move to use argc and argv directly in handle_options(),
alone with following update:
1: rename handle_options() to check_options()
to fit its function.
2: cleanup for condition in handle_options() to make line short.
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'btrfs.c')
-rw-r--r-- | btrfs.c | 32 |
1 files changed, 18 insertions, 14 deletions
@@ -172,20 +172,24 @@ static int cmd_version(int argc, char **argv) return 0; } -static void handle_options(int *argc, char ***argv) +static void check_options(int argc, char **argv) { - if (*argc > 0) { - const char *arg = (*argv)[0]; - if (arg[0] != '-' || - !strcmp(arg, "--help") || - !strcmp(arg, "--version")) - return; - fprintf(stderr, "Unknown option: %s\n", arg); - fprintf(stderr, "usage: %s\n", - btrfs_cmd_group.usagestr[0]); - exit(129); - } - return; + const char *arg; + + if (argc == 0) + return; + + arg = argv[0]; + + if (arg[0] != '-' || + !strcmp(arg, "--help") || + !strcmp(arg, "--version")) + return; + + fprintf(stderr, "Unknown option: %s\n", arg); + fprintf(stderr, "usage: %s\n", + btrfs_cmd_group.usagestr[0]); + exit(129); } static const struct cmd_group btrfs_cmd_group = { @@ -227,7 +231,7 @@ int main(int argc, char **argv) } else { argc--; argv++; - handle_options(&argc, &argv); + check_options(argc, argv); if (argc > 0) { if (!prefixcmp(argv[0], "--")) argv[0] += 2; |