import quincy beta 17.1.0

[ceph.git] / ceph / src / tools / rbd_wnbd / rbd_wnbd.cc

diff --git a/ceph/src/tools/rbd_wnbd/rbd_wnbd.cc b/ceph/src/tools/rbd_wnbd/rbd_wnbd.cc
index d2bb9d8e96e917c2e9100b81c159de14b2322ac0..0c5dc9990869105bf96ef63b7e3af8378b3b3005 100644 (file)
--- a/ceph/src/tools/rbd_wnbd/rbd_wnbd.cc
+++ b/ceph/src/tools/rbd_wnbd/rbd_wnbd.cc
@@ -53,6 +53,7 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "rbd-wnbd: "
 
+using namespace std;
 using boost::locale::conv::utf_to_utf;
 
 std::wstring to_wstring(const std::string& str)
@@ -997,8 +998,7 @@ int construct_devpath_if_missing(Config* cfg)
 boost::intrusive_ptr<CephContext> do_global_init(
   int argc, const char *argv[], Config *cfg)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   code_environment_t code_env;
   int flags;
@@ -1592,10 +1592,8 @@ static int parse_args(std::vector<const char*>& args,
 
 static int rbd_wnbd(int argc, const char *argv[])
 {
-  int r;
   Config cfg;
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   // Avoid using dout before calling "do_global_init"
   if (args.empty()) {
@@ -1604,7 +1602,7 @@ static int rbd_wnbd(int argc, const char *argv[])
   }
 
   std::ostringstream err_msg;
-  r = parse_args(args, &err_msg, &cmd, &cfg);
+  int r = parse_args(args, &err_msg, &cmd, &cfg);
   if (r == HELP_INFO) {
     usage();
     return 0;