From: Danny Al-Gaaf Date: Wed, 15 May 2013 12:21:34 +0000 (+0200) Subject: rgw/rgw_bucket.cc: reduce scope of 'max' in rgw_remove_bucket() X-Git-Tag: v0.64~119^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=682f1076aa1ae82f92e2ced6d2ee17ec8a0c0bac;p=ceph.git rgw/rgw_bucket.cc: reduce scope of 'max' in rgw_remove_bucket() Signed-off-by: Danny Al-Gaaf --- diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 2f05264778ed..23881d18ebfb 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -275,7 +275,6 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children) return ret; obj.bucket = bucket; - int max = 1000; ret = rgw_get_obj(store, NULL, store->zone.domain_root,\ bucket.name, bl, NULL); @@ -289,6 +288,7 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children) } if (delete_children) { + int max = 1000; ret = store->list_objects(bucket, max, prefix, delim, marker,\ objs, common_prefixes,\ false, ns, (bool *)false, NULL);