]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Fix dangling-gsl warning
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 17 Jul 2020 06:18:45 +0000 (02:18 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 17 Jul 2020 18:18:17 +0000 (14:18 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/rgw/rgw_op.cc

index 57acbbdf1e3f3485efb854150ae811a03aa730cb..7d3c965285d90755df9c9ab8825c6ae5d85c7aab 100644 (file)
@@ -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(),