From 4eb0e7e9dc8048b17c8a6119fb71c34e19b65603 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Mon, 8 Jan 2018 14:08:08 -0600
Subject: [PATCH] librados,libcephfs,...: use parse_env()

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/libcephfs.cc                                |  6 +-----
 src/librados/librados.cc                        |  8 +-------
 src/test/librados_test_stub/LibradosTestStub.cc | 10 +++-------
 src/tools/rbd_mirror/PoolReplayer.cc            |  2 +-
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index a903318cbd9..d5600d74cd4 100644
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -209,11 +209,7 @@ public:
   int conf_parse_env(const char *name)
   {
     md_config_t *conf = cct->_conf;
-    vector<const char*> args;
-    env_to_vec(args, name);
-    int ret = conf->parse_argv(args, CONF_ENV);
-    if (ret)
-      return ret;
+    conf->parse_env(name);
     conf->apply_changes(nullptr);
     return 0;
   }
diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index cac8c236080..02eee4fa006 100644
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -3003,13 +3003,7 @@ extern "C" int rados_conf_parse_env(rados_t cluster, const char *env)
   tracepoint(librados, rados_conf_parse_env_enter, cluster, env);
   librados::RadosClient *client = (librados::RadosClient *)cluster;
   md_config_t *conf = client->cct->_conf;
-  vector<const char*> args;
-  env_to_vec(args, env);
-  int ret = conf->parse_argv(args, CONF_ENV);
-  if (ret) {
-    tracepoint(librados, rados_conf_parse_env_exit, ret);
-    return ret;
-  }
+  conf->parse_env(env);
   conf->apply_changes(NULL);
   tracepoint(librados, rados_conf_parse_env_exit, 0);
   return 0;
diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc
index 2d88f884432..e3fc1f200ea 100644
--- a/src/test/librados_test_stub/LibradosTestStub.cc
+++ b/src/test/librados_test_stub/LibradosTestStub.cc
@@ -152,13 +152,9 @@ extern "C" int rados_conf_parse_env(rados_t cluster, const char *var) {
   librados::TestRadosClient *client =
     reinterpret_cast<librados::TestRadosClient*>(cluster);
   md_config_t *conf = client->cct()->_conf;
-  std::vector<const char*> args;
-  env_to_vec(args, var);
-  int ret = conf->parse_argv(args);
-  if (ret == 0) {
-    conf->apply_changes(NULL);
-  }
-  return ret;
+  conf->parse_env(var);
+  conf->apply_changes(NULL);
+  return 0;
 }
 
 extern "C" int rados_conf_read_file(rados_t cluster, const char *path) {
diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc
index b90f1642e31..9b932b2cfd5 100644
--- a/src/tools/rbd_mirror/PoolReplayer.cc
+++ b/src/tools/rbd_mirror/PoolReplayer.cc
@@ -422,7 +422,6 @@ int PoolReplayer::init_rados(const std::string &cluster_name,
 
   // librados::Rados::conf_parse_env
   std::vector<const char*> args;
-  env_to_vec(args, nullptr);
   r = cct->_conf->parse_argv(args);
   if (r < 0) {
     derr << "could not parse environment for " << description << ":"
@@ -430,6 +429,7 @@ int PoolReplayer::init_rados(const std::string &cluster_name,
     cct->put();
     return r;
   }
+  cct->_conf->parse_env();
 
   if (!m_args.empty()) {
     // librados::Rados::conf_parse_argv
-- 
2.47.3