From 5e05acaff46f105424965eb985db6db94c2c80f0 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Mon, 12 May 2014 00:38:48 +0200 Subject: [PATCH] rgw_op.cc: reduce scope of 'int r' in execute() Signed-off-by: Danny Al-Gaaf --- src/rgw/rgw_op.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index a4af52ccaa2..4b2e6b7e04c 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -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; -- 2.47.3