RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

librgw: fix some incorrect uses of string temporary

Browse Source 
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
Matt Benjamin 2015-12-14 15:31:55 -05:00
parent 5fe01703e7
commit a27a4070b4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rgw/rgw_file.cc
View File

@ -314,8 +314,9 @@ int rgw_unlink(struct rgw_fs *rgw_fs, struct rgw_file_handle *parent_fh,
if (! rc) {
/* rgw_fh ref+ */
RGWFileHandle* rgw_fh = get_rgwfh(fh);
std::string oname = rgw_fh->full_object_name();
RGWDeleteObjRequest req(cct, fs->get_user(), parent->bucket_name(),
rgw_fh->full_object_name());
oname);
rc = librgw.get_fe()->execute_req(&req);
/* release */
(void) rgw_fh_rele(rgw_fs, fh, 0 /* flags */);
@ -456,11 +457,10 @@ int rgw_getattr(struct rgw_fs *rgw_fs,
if (rgw_fh->creating())
goto done;
const std::string bname = rgw_fh->bucket_name();
const std::string oname = rgw_fh->object_name();
const std::string& bname = rgw_fh->bucket_name();
const std::string& oname = rgw_fh->object_name();
RGWStatObjRequest req(cct, fs->get_user(),
rgw_fh->bucket_name(), rgw_fh->object_name(),
RGWStatObjRequest req(cct, fs->get_user(), bname, oname,
RGWStatObjRequest::FLAG_NONE);
int rc = librgw.get_fe()->execute_req(&req);
@ -641,8 +641,9 @@ int rgw_write(struct rgw_fs *rgw_fs,
buffer::create_static(length /* XXX size */, static_cast<char*>(buffer)));
/* XXX */
std::string oname = rgw_fh->full_object_name();
RGWPutObjRequest req(cct, fs->get_user(), rgw_fh->bucket_name(),
rgw_fh->full_object_name(), bl);
oname, bl);
int rc = librgw.get_fe()->execute_req(&req);
@ -752,8 +753,9 @@ int rgw_readv(struct rgw_fs *rgw_fs,
static_cast<char*>(vio->vio_base)));
}
std::string oname = rgw_fh->full_object_name();
RGWPutObjRequest req(cct, fs->get_user(), rgw_fh->bucket_name(),
rgw_fh->full_object_name(), bl);
oname, bl);
int rc = librgw.get_fe()->execute_req(&req);