From eda44cd39c5e97f5e121c5d6ad08a48312d4897c Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 30 Nov 2015 13:51:35 -0800 Subject: [PATCH] rgw: a minor cleanup Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rest_swift.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index 95cb8f514c6..06817ad8a53 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -1223,8 +1223,7 @@ int RGWHandler_ObjStore_SWIFT::init(RGWRados *store, struct req_state *s, RGWCli ret = validate_tenant_name(s->bucket_tenant); if (ret) return ret; - /* XXX The c_str is redundant here, isn't it? We do one inside. */ - ret = validate_bucket_name(s->bucket_name.c_str()); + ret = validate_bucket_name(s->bucket_name); if (ret) return ret; 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; 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) return ret; } -- 2.39.5