From 9416a983c63652f2e4de440c93cad5b539c75f00 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 2 Jun 2014 16:04:44 +0200 Subject: [PATCH] rename one char variable names --- Contractor/TemporaryStorage.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Contractor/TemporaryStorage.cpp b/Contractor/TemporaryStorage.cpp index cdd853642..7f210eb42 100644 --- a/Contractor/TemporaryStorage.cpp +++ b/Contractor/TemporaryStorage.cpp @@ -125,7 +125,7 @@ void TemporaryStorage::ReadFromSlot(const int slot_id, char *pointer, const std: BOOST_ASSERT(!data.write_mode); data.temp_file->read(pointer, size); } - catch (boost::filesystem::filesystem_error &e) { Abort(e); } + catch (boost::filesystem::filesystem_error &error) { Abort(error); } } uint64_t TemporaryStorage::GetFreeBytesOnTemporaryDevice() @@ -133,19 +133,19 @@ uint64_t TemporaryStorage::GetFreeBytesOnTemporaryDevice() uint64_t value = -1; try { - boost::filesystem::path p = boost::filesystem::temp_directory_path(); - boost::filesystem::space_info s = boost::filesystem::space(p); - value = s.free; + boost::filesystem::path path = boost::filesystem::temp_directory_path(); + boost::filesystem::space_info space_info = boost::filesystem::space(path); + value = space_info.free; } - catch (boost::filesystem::filesystem_error &e) { Abort(e); } + catch (boost::filesystem::filesystem_error &error) { Abort(error); } return value; } void TemporaryStorage::CheckIfTemporaryDeviceFull() { - boost::filesystem::path p = boost::filesystem::temp_directory_path(); - boost::filesystem::space_info s = boost::filesystem::space(p); - if ((1024 * 1024) > s.free) + boost::filesystem::path path = boost::filesystem::temp_directory_path(); + boost::filesystem::space_info space_info = boost::filesystem::space(path); + if ((1024 * 1024) > space_info.free) { throw OSRMException("temporary device is full"); } @@ -164,8 +164,8 @@ boost::filesystem::fstream::pos_type TemporaryStorage::Tell(const int slot_id) return position; } -void TemporaryStorage::Abort(const boost::filesystem::filesystem_error &e) +void TemporaryStorage::Abort(const boost::filesystem::filesystem_error &error) { RemoveAll(); - throw OSRMException(e.what()); + throw OSRMException(error.what()); }