RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-25 04:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: a minor cleanup

Browse Source 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-11-30 13:51:35 -08:00
parent bf0a7b41e7
commit eda44cd39c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rgw/rgw_rest_swift.cc
View File

@ -1223,8 +1223,7 @@ int RGWHandler_ObjStore_SWIFT::init(RGWRados *store, struct req_state *s, RGWCli
ret = validate_tenant_name(s->bucket_tenant); ret = validate_tenant_name(s->bucket_tenant);
if (ret) if (ret)
return ret; return ret;
/* XXX The c_str is redundant here, isn't it? We do one inside. */ ret = validate_bucket_name(s->bucket_name);
ret = validate_bucket_name(s->bucket_name.c_str());
if (ret) if (ret)
return ret; return ret;
ret = validate_object_name(s->object.name); ret = validate_object_name(s->object.name);
@ -1255,7 +1254,7 @@ int RGWHandler_ObjStore_SWIFT::init(RGWRados *store, struct req_state *s, RGWCli
string dest_object = dest_obj_key.name; string dest_object = dest_obj_key.name;
if (dest_bucket_name != s->bucket_name) { if (dest_bucket_name != s->bucket_name) {
ret = validate_bucket_name(dest_bucket_name.c_str()); ret = validate_bucket_name(dest_bucket_name);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }