Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
11537156
Something went wrong on our end.
Commit
11537156
authored
5 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input/buffering: rename "read_error" to "error"
The "seek_error" attribute will be eliminated soon.
parent
b5c7c16f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
BufferingInputStream.cxx
src/input/BufferingInputStream.cxx
+5
-5
BufferingInputStream.hxx
src/input/BufferingInputStream.hxx
+1
-1
No files found.
src/input/BufferingInputStream.cxx
View file @
11537156
...
...
@@ -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
();
}
...
...
This diff is collapsed.
Click to expand it.
src/input/BufferingInputStream.hxx
View file @
11537156
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment