Chromium Code Reviews| Index: net/base/file_stream_context_win.cc |
| diff --git a/net/base/file_stream_context_win.cc b/net/base/file_stream_context_win.cc |
| index 3b942d35edc532659f8ccdf2035c4aa990cafe70..369dfc1ad97515d62fbe2b73873fe87b8c90d058 100644 |
| --- a/net/base/file_stream_context_win.cc |
| +++ b/net/base/file_stream_context_win.cc |
| @@ -68,14 +68,13 @@ int FileStream::Context::Read(IOBuffer* buf, |
| if (!ReadFile(file_.GetPlatformFile(), buf->data(), buf_len, |
| &bytes_read, &io_context_.overlapped)) { |
| IOResult error = IOResult::FromOSError(GetLastError()); |
| - if (error.os_error == ERROR_IO_PENDING) { |
| - IOCompletionIsPending(callback, buf); |
| - } else if (error.os_error == ERROR_HANDLE_EOF) { |
| + if (error.os_error == ERROR_HANDLE_EOF) |
| return 0; // Report EOF by returning 0 bytes read. |
|
Peter Kasting
2014/11/18 00:41:03
This change is to comply with the Chromium "no els
|
| - } else { |
| + if (error.os_error == ERROR_IO_PENDING) |
| + IOCompletionIsPending(callback, buf); |
| + else |
| LOG(WARNING) << "ReadFile failed: " << error.os_error; |
| - } |
| - return error.result; |
| + return static_cast<int>(error.result); |
| } |
| IOCompletionIsPending(callback, buf); |
| @@ -89,12 +88,11 @@ int FileStream::Context::Write(IOBuffer* buf, |
| if (!WriteFile(file_.GetPlatformFile(), buf->data(), buf_len, |
| &bytes_written, &io_context_.overlapped)) { |
| IOResult error = IOResult::FromOSError(GetLastError()); |
| - if (error.os_error == ERROR_IO_PENDING) { |
| + if (error.os_error == ERROR_IO_PENDING) |
| IOCompletionIsPending(callback, buf); |
| - } else { |
| + else |
| LOG(WARNING) << "WriteFile failed: " << error.os_error; |
| - } |
| - return error.result; |
| + return static_cast<int>(error.result); |
| } |
| IOCompletionIsPending(callback, buf); |
| @@ -149,7 +147,7 @@ void FileStream::Context::OnIOCompleted( |
| result = 0; |
| } else if (error) { |
| IOResult error_result = IOResult::FromOSError(error); |
| - result = error_result.result; |
| + result = static_cast<int>(error_result.result); |
| } else { |
| result = bytes_read; |
| IncrementOffset(&io_context_.overlapped, bytes_read); |