crushtool: fix argument parsing

Reported by: Henry C Chang <henry.cy.chang@gmail.com>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/crushtool.cc b/src/crushtool.cc
index b3275efccce1c5aefbc37200b3a2087551a52b8f..8d1ba5507c1fd55d285d2ea33171ee12b826d63d 100644 (file)
--- a/src/crushtool.cc
+++ b/src/crushtool.cc
@@ -867,9 +867,6 @@ int main(int argc, const char **argv)
        cerr << err.str() << std::endl;
        exit(EXIT_FAILURE);
       }
-      if (i == args.end())
-       usage();
-      i = args.erase(i);
       if (i == args.end())
        usage();
       add_weight = atof(*i);
@@ -880,9 +877,6 @@ int main(int argc, const char **argv)
       i = args.erase(i);
     } else if (ceph_argparse_witharg(args, i, &val, "--loc", (char*)NULL)) {
       std::string type(val);
-      if (i == args.end())
-       usage();
-      i = args.erase(i);
       if (i == args.end())
        usage();
       std::string name(*i);
@@ -892,9 +886,6 @@ int main(int argc, const char **argv)
       remove_name = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--reweight_item", (char*)NULL)) {
       reweight_name = val;
-      if (i == args.end())
-       usage();
-      i = args.erase(i);
       if (i == args.end())
        usage();
       reweight_weight = atof(*i);
@@ -949,9 +940,6 @@ int main(int argc, const char **argv)
        exit(EXIT_FAILURE);
       }
       int dev = tmp;
-      if (i == args.end())
-       usage();
-      i = args.erase(i);
       if (i == args.end())
        usage();
       float f = atof(*i);