btrfs-progs: use values directly for BLOCK_GROUP_ macros

[platform/upstream/btrfs-progs.git] / btrfs.c

diff --git a/btrfs.c b/btrfs.c
index 9416a29..cc70515 100644 (file)
--- a/btrfs.c
+++ b/btrfs.c
@@ -37,15 +37,6 @@ static inline const char *skip_prefix(const char *str, const char *prefix)
        return strncmp(str, prefix, len) ? NULL : str + len;
 }
 
        return strncmp(str, prefix, len) ? NULL : str + len;
 }
 

-int prefixcmp(const char *str, const char *prefix)
-{
-       for (; ; str++, prefix++)
-               if (!*prefix)
-                       return 0;
-               else if (*str != *prefix)
-                       return (unsigned char)*prefix - (unsigned char)*str;
-}
-

 static int parse_one_token(const char *arg, const struct cmd_group *grp,
                           const struct cmd_struct **cmd_ret)
 {
 static int parse_one_token(const char *arg, const struct cmd_group *grp,
                           const struct cmd_struct **cmd_ret)
 {


@@ -172,20 +163,24 @@ static int cmd_version(int argc, char **argv)
        return 0;
 }
 
        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 = {
 }
 
 static const struct cmd_group btrfs_cmd_group = {


@@ -227,7 +222,7 @@ int main(int argc, char **argv)
        } else {
                argc--;
                argv++;
        } else {
                argc--;
                argv++;

-               handle_options(&argc, &argv);
+               check_options(argc, argv);

                if (argc > 0) {
                        if (!prefixcmp(argv[0], "--"))
                                argv[0] += 2;
                if (argc > 0) {
                        if (!prefixcmp(argv[0], "--"))
                                argv[0] += 2;