From 3db180d470e96a156c855fd625f2b65882e9d698 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Mon, 22 Sep 2014 12:57:17 +0300
Subject: [PATCH] Review fixes.

---
 coding/file_container.cpp    | 2 --
 routing/osrm2feature_map.cpp | 8 +++-----
 routing/osrm2feature_map.hpp | 1 +
 routing/osrm_router.cpp      | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/coding/file_container.cpp b/coding/file_container.cpp
index 307a9827a4..2e51a41dd2 100644
--- a/coding/file_container.cpp
+++ b/coding/file_container.cpp
@@ -170,8 +170,6 @@ FileReader FilesMappingContainer::GetReader(Tag const & tag) const
     return FileReader(m_name).SubReader(p->m_offset, p->m_size);
   else
     MYTHROW(Reader::OpenException, ("Can't find section:", tag));
-
-  return FileReader("xxx");
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/routing/osrm2feature_map.cpp b/routing/osrm2feature_map.cpp
index ecefe5c862..89cbef8c12 100644
--- a/routing/osrm2feature_map.cpp
+++ b/routing/osrm2feature_map.cpp
@@ -7,6 +7,7 @@
 #include "../base/assert.hpp"
 #include "../base/logging.hpp"
 #include "../base/math.hpp"
+#include "../base/scope_guard.hpp"
 
 #include "../std/fstream.hpp"
 #include "../std/sstream.hpp"
@@ -28,10 +29,8 @@ OsrmFtSegMapping::FtSeg::FtSeg(uint32_t fid, uint32_t ps, uint32_t pe)
 }
 
 OsrmFtSegMapping::FtSeg::FtSeg(uint64_t x)
+  : m_fid(x & 0xFFFFFFFF), m_pointStart(x >> 48), m_pointEnd((x >> 32) & 0xFFFF)
 {
-  m_fid = x & 0xFFFFFFFF;
-  m_pointEnd = (x >> 32) & 0xFFFF;
-  m_pointStart = (x >> 48);
 }
 
 uint64_t OsrmFtSegMapping::FtSeg::Store() const
@@ -264,12 +263,11 @@ void OsrmFtSegMappingBuilder::Save(FilesContainerW & cont) const
   }
 
   string const fName = cont.GetFileName() + "." ROUTING_FTSEG_FILE_TAG;
+  MY_SCOPE_GUARD(deleteFileGuard, bind(&FileWriter::DeleteFileX, cref(fName)));
 
   succinct::elias_fano_compressed_list compressed(m_buffer);
   succinct::mapper::freeze(compressed, fName.c_str());
   cont.Write(fName, ROUTING_FTSEG_FILE_TAG);
-
-  FileWriter::DeleteFileX(fName);
 }
 
 }
diff --git a/routing/osrm2feature_map.hpp b/routing/osrm2feature_map.hpp
index 7a5200c1f5..d29a75d48d 100644
--- a/routing/osrm2feature_map.hpp
+++ b/routing/osrm2feature_map.hpp
@@ -27,6 +27,7 @@ public:
 
     static constexpr uint32_t INVALID_FID = -1;
 
+    // No need to initialize something her (for vector<FtSeg>).
     FtSeg() {}
     FtSeg(uint32_t fid, uint32_t ps, uint32_t pe);
 
diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp
index d3b2eff7e1..40d545f4f3 100644
--- a/routing/osrm_router.cpp
+++ b/routing/osrm_router.cpp
@@ -111,7 +111,7 @@ public:
   }
 };
 
-}
+} // namespace
 
 
 OsrmRouter::OsrmRouter(Index const * index, CountryFileFnT const & fn)
@@ -255,7 +255,7 @@ void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback con
 
       auto correctFn = [&buffer] (SegT const & seg, size_t & ind)
       {
-        auto it = find_if(buffer.begin(), buffer.end(), [&seg] (OsrmFtSegMapping::FtSeg const & s)
+        auto const it = find_if(buffer.begin(), buffer.end(), [&seg] (OsrmFtSegMapping::FtSeg const & s)
         {
           return s.IsIntersect(seg);
         });