From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 15 May 2013 12:57:10 +0000 (+0200)
Subject: rgw/rgw_tools.cc: reduce scope of 'ret' in rgw_get_obj()
X-Git-Tag: v0.64~119^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95bf066b66eeeee21a7252bd60a90d076e9a70e7;p=ceph.git

rgw/rgw_tools.cc: reduce scope of 'ret' in rgw_get_obj()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc
index e83e49a0652b..20aa02292c8f 100644
--- a/src/rgw/rgw_tools.cc
+++ b/src/rgw/rgw_tools.cc
@@ -35,14 +35,13 @@ int rgw_put_system_obj(RGWRados *rgwstore, rgw_bucket& bucket, string& oid, cons
 
 int rgw_get_obj(RGWRados *rgwstore, void *ctx, rgw_bucket& bucket, string& key, bufferlist& bl, map<string, bufferlist> *pattrs)
 {
-  int ret;
   struct rgw_err err;
   void *handle = NULL;
   bufferlist::iterator iter;
   int request_len = READ_CHUNK_LEN;
   rgw_obj obj(bucket, key);
   do {
-    ret = rgwstore->prepare_get_obj(ctx, obj, NULL, NULL, pattrs, NULL,
+    int ret = rgwstore->prepare_get_obj(ctx, obj, NULL, NULL, pattrs, NULL,
                                   NULL, NULL, NULL, NULL, NULL, NULL, &handle, &err);
     if (ret < 0)
       return ret;