diff options
| author | Max Kellermann <max@musicpd.org> | 2019-05-17 11:29:19 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2019-05-17 11:29:19 +0200 |
| commit | 1153715608f5eb901293d63147ea7502ac275e56 (patch) | |
| tree | e32439867dc080e6c7c39e848aea9afb5e79e788 | |
| parent | b5c7c16fb4b3bbe6ed2357c6fb4132d3cf0cb82b (diff) | |
input/buffering: rename "read_error" to "error"
The "seek_error" attribute will be eliminated soon.
| -rw-r--r-- | src/input/BufferingInputStream.cxx | 10 | ||||
| -rw-r--r-- | src/input/BufferingInputStream.hxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/input/BufferingInputStream.cxx b/src/input/BufferingInputStream.cxx index 7412a7025..246f911f9 100644 --- a/src/input/BufferingInputStream.cxx +++ b/src/input/BufferingInputStream.cxx @@ -48,8 +48,8 @@ BufferingInputStream::~BufferingInputStream() noexcept void BufferingInputStream::Check() { - if (read_error) - std::rethrow_exception(read_error); + if (error) + std::rethrow_exception(error); if (input) input->Check(); @@ -111,8 +111,8 @@ BufferingInputStream::Read(std::unique_lock<Mutex> &lock, void *ptr, size_t s) return nbytes; } - if (read_error) - std::rethrow_exception(read_error); + if (error) + std::rethrow_exception(error); client_cond.wait(lock); } @@ -221,7 +221,7 @@ BufferingInputStream::RunThread() noexcept try { RunThreadLocked(lock); } catch (...) { - read_error = std::current_exception(); + error = std::current_exception(); client_cond.notify_all(); OnBufferAvailable(); } diff --git a/src/input/BufferingInputStream.hxx b/src/input/BufferingInputStream.hxx index 4f7a50607..061324142 100644 --- a/src/input/BufferingInputStream.hxx +++ b/src/input/BufferingInputStream.hxx @@ -61,7 +61,7 @@ class BufferingInputStream : InputStreamHandler { size_t seek_offset; - std::exception_ptr read_error, seek_error; + std::exception_ptr error, seek_error; static constexpr size_t INVALID_OFFSET = ~size_t(0); |