]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: a minor cleanup
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 30 Nov 2015 21:51:35 +0000 (13:51 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 2 Dec 2015 18:45:41 +0000 (10:45 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rest_swift.cc

index 95cb8f514c68302a825d633ba725baf8010b4ecf..06817ad8a5376442c69eb260427be51a385e5ba6 100644 (file)
@@ -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;
     }