From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 11 Mar 2013 14:07:36 +0000 (+0100)
Subject: rados_export.cc: reduce scope of 'int ret' in do_rados_export()
X-Git-Tag: v0.60~106^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b3cef7e1d74729208d3eb141c6276bdf005cf2d;p=ceph.git

rados_export.cc: reduce scope of 'int ret' in do_rados_export()

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

diff --git a/src/rados_export.cc b/src/rados_export.cc
index 15e22b9cf369..5b8a899d3b8b 100644
--- a/src/rados_export.cc
+++ b/src/rados_export.cc
@@ -179,7 +179,6 @@ int do_rados_export(ThreadPool *tp, IoCtx& io_ctx,
       IoCtxDistributor *io_ctx_dist, const char *dir_name,
       bool create, bool force, bool delete_after)
 {
-  int ret;
   librados::ObjectIterator oi = io_ctx.objects_begin();
   librados::ObjectIterator oi_end = io_ctx.objects_end();
   auto_ptr <ExportDir> export_dir;
@@ -213,7 +212,7 @@ int do_rados_export(ThreadPool *tp, IoCtx& io_ctx,
 	char path[strlen(dir_name) + strlen(de->d_name) + 2];
 	snprintf(path, sizeof(path), "%s/%s", dir_name, de->d_name);
 	if (unlink(path)) {
-	  ret = errno;
+	  int ret = errno;
 	  cerr << ERR_PREFIX << "error unlinking temporary file '" << path << "': "
 	       << cpp_strerror(ret) << std::endl;
 	  return ret;