From 34f1baf3e7d88cc2b59e0fc4df4cf7fbb167843e Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Fri, 17 Jul 2020 02:18:45 -0400 Subject: [PATCH] rgw: Fix dangling-gsl warning Signed-off-by: Adam C. Emerson --- src/rgw/rgw_op.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 57acbbdf1e3..7d3c965285d 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(), -- 2.39.5