Merge pull request ceph#39667 from tchaikov/wip-tools-rados-optional

tools/rados: assign to optional<> without deref'ing it Reviewed-by: Radoslaw Zarzynski <[email protected]>
joskid · Feb 24, 2021 · 1a4b77a · 1a4b77a
2 parents 9c48327 + 41d6859
commit 1a4b77a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
@@ -2723,7 +2723,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
     }
     string attr_name(nargs[obj_name ? 1 : 2]);
     if (!obj_name) {
-      *obj_name = nargs[1];
+      obj_name = nargs[1];
     }
     bufferlist bl;
     ret = detail::getxattr(io_ctx, *obj_name, attr_name, bl, use_striper);
@@ -2744,7 +2744,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
 
     string attr_name(nargs[obj_name ? 1 : 2]);
     if (!obj_name) {
-      *obj_name = nargs[1];
+      obj_name = nargs[1];
     }
     ret = detail::rmxattr(io_ctx, *obj_name, attr_name, use_striper);