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

Simplify read error detection.

Browse Source
This commit is contained in:
Daniel Patterson 2016-11-14 18:43:30 -08:00
parent 608044305d
commit d8b016b92a
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/storage/io.hpp
View File

@ -56,21 +56,17 @@ class FileReader
"bytewise reading requires trivially copyable type"); "bytewise reading requires trivially copyable type");
if (count == 0) if (count == 0)
return; return;
input_stream.read(reinterpret_cast<char *>(dest), count * sizeof(T));
// safe to cast here, according to CPP docs, negative values for gcount const auto &result = input_stream.read(reinterpret_cast<char *>(dest), count * sizeof(T));
// are never used. if (!result)
const unsigned long bytes_read = static_cast<unsigned long>(input_stream.gcount());
const auto expected_bytes = count * sizeof(T);
if (bytes_read == 0)
{ {
if (result.eof())
{
throw util::exception("Error reading from " + filename +
": Unexpected end of file");
}
throw util::exception("Error reading from " + filename + ": " + std::strerror(errno)); throw util::exception("Error reading from " + filename + ": " + std::strerror(errno));
} }
else if (bytes_read < expected_bytes)
{
throw util::exception("Error reading from " + filename + ": Unexpected end of file");
}
} }
template <typename T> void ReadInto(T &target) { ReadInto(&target, 1); } template <typename T> void ReadInto(T &target) { ReadInto(&target, 1); }