From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 17 Jul 2020 06:18:45 +0000 (-0400)
Subject: rgw: Fix dangling-gsl warning
X-Git-Tag: v16.1.0~1661^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34f1baf3e7d88cc2b59e0fc4df4cf7fbb167843e;p=ceph.git

rgw: Fix dangling-gsl warning

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 57acbbdf1e3f..7d3c965285d9 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -7394,9 +7394,12 @@ void RGWBulkUploadOp::execute()
         case rgw::tar::FileType::NORMAL_FILE: {
           ldpp_dout(this, 2) << "handling regular file" << dendl;
 
-          std::string_view filename = bucket_path.empty() ? header->get_filename() : \
-                            file_prefix + std::string(header->get_filename());
-          auto body = AlignedStreamGetter(0, header->get_filesize(),
+          std::string_view filename;
+	  if (bucket_path.empty())
+	    filename = header->get_filename();
+	  else
+	    filename = file_prefix + std::string(header->get_filename());
+	  auto body = AlignedStreamGetter(0, header->get_filesize(),
                                           rgw::tar::BLOCK_SIZE, *stream);
           op_ret = handle_file(filename,
                                header->get_filesize(),