]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rados_export.cc: reduce scope of 'int ret' in do_rados_export()
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Mon, 11 Mar 2013 14:07:36 +0000 (15:07 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Mon, 11 Mar 2013 14:07:36 +0000 (15:07 +0100)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/rados_export.cc

index 15e22b9cf369bd8af5d8416ed3e1a2fa87283968..5b8a899d3b8b21c52b6b398d365d5607e044a301 100644 (file)
@@ -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;