Merge pull request #119 from dhruvibm/1060

Removed unwanted std::move operations
ibm-openbmc · Aug 24, 2023 · 08a75be · 08a75be
2 parents 476867c + c76261e
commit 08a75be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/dump_offload_main.cpp b/dump_offload_main.cpp
@@ -15,20 +15,20 @@ int main(int argc, char** argv)
     // Read arguments.
     auto options = phosphor::dump::util::ArgumentParser(argc, argv);
 
-    std::string idStr = std::move((options)["id"]);
+    std::string idStr = (options)["id"];
     if (idStr.empty())
     {
         ExitWithError("Dump id is not provided", argv);
     }
     auto id = std::stoi(idStr);
 
-    std::filesystem::path path = std::move((options)["path"]);
+    std::filesystem::path path = (options)["path"];
     if (path.empty())
     {
         ExitWithError("Dump file path not specified.", argv);
     }
 
-    std::string uri = std::move((options)["uri"]);
+    std::string uri = (options)["uri"];
     if (path.empty())
     {
         ExitWithError("Dump offload uri not specified.", argv);

diff --git a/dump_utils.cpp b/dump_utils.cpp
@@ -97,7 +97,10 @@ std::string getStateValue(const std::string& intf, const std::string& objPath,
 
         reply.read(propertyVal);
 
-        stateVal = std::get<std::string>(propertyVal);
+        if (std::holds_alternative<std::string>(propertyVal))
+        {
+            stateVal = std::get<std::string>(propertyVal);
+        }
     }
     catch (const sdbusplus::exception_t& e)
     {