oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/io/Reader: use C++ exceptions instead of class Error

Browse Source
This commit is contained in:
Max Kellermann
2015-12-16 11:05:33 +01:00
parent fe60c52c70
commit e6e7d6dbd6
33 changed files with 192 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fs/io/BufferedReader.cxx
View File

@@ -25,9 +25,6 @@
bool
BufferedReader::Fill(bool need_more)
{
if (gcc_unlikely(last_error.IsDefined()))
return false;
if (eof)
return !need_more;
@@ -41,11 +38,8 @@ BufferedReader::Fill(bool need_more)
assert(!w.IsEmpty());
}
size_t nbytes = reader.Read(w.data, w.size, last_error);
size_t nbytes = reader.Read(w.data, w.size);
if (nbytes == 0) {
if (gcc_unlikely(last_error.IsDefined()))
return false;
eof = true;
return !need_more;
}
@@ -65,7 +59,7 @@ BufferedReader::ReadLine()
}
} while (Fill(true));
if (last_error.IsDefined() || !eof || buffer.IsEmpty())
if (!eof || buffer.IsEmpty())
return nullptr;
auto w = buffer.Write();