From 6eb8862e91d142451e256aaa02b34c81a4f21dea Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 22 Sep 2011 21:01:22 -0700 Subject: [PATCH] crushtool: fix argument parsing Reported by: Henry C Chang Signed-off-by: Sage Weil --- src/crushtool.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/crushtool.cc b/src/crushtool.cc index b3275efccce1c..8d1ba5507c1fd 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); -- 2.39.5