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 <[email protected]> --- btrfs.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/btrfs.c b/btrfs.c index 9416a29..f881c18 100644 --- a/btrfs.c +++ b/btrfs.c @@ -172,20 +172,22 @@ 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; + if (argc == 0) + return; + + 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); } static const struct cmd_group btrfs_cmd_group = { @@ -227,7 +229,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; -- 1.8.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
