Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Don't use bool return values on successful write, instead rely on exception throwing

Browse Source
This commit is contained in:
Pepijn Schoen 2017-01-31 19:18:26 +01:00 committed by Patrick Niklaus
parent 11ee632cfe
commit 9d2628b74f
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/storage/io.hpp
View File

@ -224,7 +224,7 @@ class FileWriter
} }
/* Write count objects of type T from pointer src to output stream */ /* Write count objects of type T from pointer src to output stream */
template <typename T> bool WriteFrom(const T *src, const std::size_t count) template <typename T> void WriteFrom(const T *src, const std::size_t count)
{ {
#if not defined __GNUC__ or __GNUC__ > 4 #if not defined __GNUC__ or __GNUC__ > 4
static_assert(std::is_trivially_copyable<T>::value, static_assert(std::is_trivially_copyable<T>::value,
@ -232,33 +232,32 @@ class FileWriter
#endif #endif
if (count == 0) if (count == 0)
return true; return;
const auto &result = const auto &result =
output_stream.write(reinterpret_cast<const char *>(src), count * sizeof(T)); output_stream.write(reinterpret_cast<const char *>(src), count * sizeof(T));
if (!result) if (!result)
{ {
throw util::exception("Error writing to " + filepath.string()); throw util::exception("Error writing to " + filepath.string());
} }
return static_cast<bool>(output_stream);
} }
template <typename T> bool WriteFrom(const T &target) { return WriteFrom(&target, 1); } template <typename T> void WriteFrom(const T &target) { WriteFrom(&target, 1); }
template <typename T> bool WriteOne(const T tmp) { return WriteFrom(tmp); } template <typename T> void WriteOne(const T tmp) { WriteFrom(tmp); }
bool WriteElementCount32(const std::uint32_t count) { return WriteOne<std::uint32_t>(count); } void WriteElementCount32(const std::uint32_t count) { WriteOne<std::uint32_t>(count); }
bool WriteElementCount64(const std::uint64_t count) { return WriteOne<std::uint64_t>(count); } void WriteElementCount64(const std::uint64_t count) { WriteOne<std::uint64_t>(count); }
template <typename T> bool SerializeVector(const std::vector<T> &data) template <typename T> void SerializeVector(const std::vector<T> &data)
{ {
const auto count = data.size(); const auto count = data.size();
WriteElementCount64(count); WriteElementCount64(count);
return WriteFrom(data.data(), count); return WriteFrom(data.data(), count);
} }
bool WriteFingerprint() void WriteFingerprint()
{ {
const auto fingerprint = util::FingerPrint::GetValid(); const auto fingerprint = util::FingerPrint::GetValid();
return WriteOne(fingerprint); return WriteOne(fingerprint);

11
include/util/io.hpp
View File

@ -71,15 +71,8 @@ bool serializeVectorIntoAdjacencyArray(const std::string &filename,
for (auto const &vec : data) for (auto const &vec : data)
all_data.insert(all_data.end(), vec.begin(), vec.end()); all_data.insert(all_data.end(), vec.begin(), vec.end());
if (!file.SerializeVector(offsets)) file.SerializeVector(offsets);
{ file.SerializeVector(all_data);
return false;
}
if (!file.SerializeVector(all_data))
{
return false;
}
return true; return true;
} }