common/options: pass name as rvalue reference

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/common/options.h b/src/common/options.h
index ad39936d43ae5412b259fc37e1f04f889ca9545c..abded4cc0dd97a4dc6fec867c01cf39781da4446 100644 (file)
--- a/src/common/options.h
+++ b/src/common/options.h
@@ -207,8 +207,8 @@ struct Option {
   typedef std::function<int(std::string *, std::string *)> validator_fn_t;
   validator_fn_t validator;
 
-  Option(std::string const &name, type_t t, level_t l)
-    : name(name), type(t), level(l)
+  Option(std::string &&name, type_t t, level_t l)
+    : name(std::move(name)), type(t), level(l)
   {
     // While value_t is nullable (via std::monostate), we don't ever
     // want it set that way in an Option instance: within an instance,

diff --git a/src/mon/ConfigMap.cc b/src/mon/ConfigMap.cc
index 86528c1dedfeef11998583a1bdb9ca0e2c113601..1444103f46050bb6520c1be04d64484119831278 100644 (file)
--- a/src/mon/ConfigMap.cc
+++ b/src/mon/ConfigMap.cc
@@ -266,7 +266,7 @@ int ConfigMap::add_option(
     ldout(cct, 10) << __func__ << " unrecognized option '" << name << "'" << dendl;
     stray_options.push_back(
       std::unique_ptr<Option>(
-       new Option(name, Option::TYPE_STR, Option::LEVEL_UNKNOWN)));
+       new Option(std::string{name}, Option::TYPE_STR, Option::LEVEL_UNKNOWN)));
     opt = stray_options.back().get();
   }
 

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index c235d9e6219e9ffa58b00416994436434546ee71..30382b97052018ca0b0396c37bb6d59f00107a56 100644 (file)
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -215,7 +215,7 @@ void MgrMonitor::update_from_paxos(bool *need_bootstrap)
       string name = string("mgr/") + i.name + "/" + j.second.name;
       auto p = mgr_module_options.emplace(
        name,
-       Option(name, static_cast<Option::type_t>(j.second.type),
+       Option(std::string{name}, static_cast<Option::type_t>(j.second.type),
               static_cast<Option::level_t>(j.second.level)));
       Option& opt = p.first->second;
       opt.set_flags(static_cast<Option::flag_t>(j.second.flags));