]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw_op.cc: reduce scope of 'int r' in execute()
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Sun, 11 May 2014 22:38:48 +0000 (00:38 +0200)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Sun, 11 May 2014 22:38:48 +0000 (00:38 +0200)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/rgw/rgw_op.cc

index a4af52ccaa2e31b217dcebd5fad264c0d8ba5ad1..4b2e6b7e04ccc97f1b0d649f5abab6cb5fe5fcad 100644 (file)
@@ -1170,7 +1170,6 @@ void RGWCreateBucket::execute()
   bufferlist aclbl;
   bufferlist corsbl;
   bool existed;
-  int r;
   rgw_obj obj(store->zone.domain_root, s->bucket_name_str);
   obj_version objv, *pobjv = NULL;
 
@@ -1194,8 +1193,8 @@ void RGWCreateBucket::execute()
   s->bucket_owner.set_id(s->user.user_id);
   s->bucket_owner.set_name(s->user.display_name);
   if (s->bucket_exists) {
-    r = get_policy_from_attr(s->cct, store, s->obj_ctx, s->bucket_info, s->bucket_attrs,
-                             &old_policy, obj);
+    int r = get_policy_from_attr(s->cct, store, s->obj_ctx, s->bucket_info, s->bucket_attrs,
+                                 &old_policy, obj);
     if (r >= 0)  {
       if (old_policy.get_owner().get_id().compare(s->user.user_id) != 0) {
         ret = -EEXIST;