From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 23 Sep 2011 04:01:22 +0000 (-0700)
Subject: crushtool: fix argument parsing
X-Git-Tag: v0.36~21^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6eb8862e91d142451e256aaa02b34c81a4f21dea;p=ceph.git

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 b3275efccce1..8d1ba5507c1f 100644
--- 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);