| Index: net/base/file_stream_context_posix.cc
|
| diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc
|
| index ecf92855be3370c207842d6b2fe9a3004f1952e9..253c27a9e48870562af56884debfd0518e42676f 100644
|
| --- a/net/base/file_stream_context_posix.cc
|
| +++ b/net/base/file_stream_context_posix.cc
|
| @@ -40,14 +40,12 @@ namespace net {
|
| COMPILE_ASSERT(sizeof(int64) == sizeof(off_t), off_t_64_bit);
|
|
|
| // Make sure our Whence mappings match the system headers.
|
| -COMPILE_ASSERT(FROM_BEGIN == SEEK_SET &&
|
| - FROM_CURRENT == SEEK_CUR &&
|
| - FROM_END == SEEK_END, whence_matches_system);
|
| +COMPILE_ASSERT(FROM_BEGIN == SEEK_SET&& FROM_CURRENT == SEEK_CUR&& FROM_END ==
|
| + SEEK_END,
|
| + whence_matches_system);
|
|
|
| FileStream::Context::Context(const scoped_refptr<base::TaskRunner>& task_runner)
|
| - : async_in_progress_(false),
|
| - orphaned_(false),
|
| - task_runner_(task_runner) {
|
| + : async_in_progress_(false), orphaned_(false), task_runner_(task_runner) {
|
| }
|
|
|
| FileStream::Context::Context(base::File file,
|
| @@ -101,7 +99,8 @@ int FileStream::Context::WriteAsync(IOBuffer* in_buf,
|
|
|
| FileStream::Context::IOResult FileStream::Context::SeekFileImpl(Whence whence,
|
| int64 offset) {
|
| - off_t res = lseek(file_.GetPlatformFile(), static_cast<off_t>(offset),
|
| + off_t res = lseek(file_.GetPlatformFile(),
|
| + static_cast<off_t>(offset),
|
| static_cast<int>(whence));
|
| if (res == static_cast<off_t>(-1))
|
| return IOResult::FromOSError(errno);
|
| @@ -121,8 +120,8 @@ FileStream::Context::IOResult FileStream::Context::ReadFileImpl(
|
| scoped_refptr<IOBuffer> buf,
|
| int buf_len) {
|
| // Loop in the case of getting interrupted by a signal.
|
| - ssize_t res = HANDLE_EINTR(read(file_.GetPlatformFile(), buf->data(),
|
| - static_cast<size_t>(buf_len)));
|
| + ssize_t res = HANDLE_EINTR(
|
| + read(file_.GetPlatformFile(), buf->data(), static_cast<size_t>(buf_len)));
|
| if (res == -1)
|
| return IOResult::FromOSError(errno);
|
|
|
| @@ -132,8 +131,8 @@ FileStream::Context::IOResult FileStream::Context::ReadFileImpl(
|
| FileStream::Context::IOResult FileStream::Context::WriteFileImpl(
|
| scoped_refptr<IOBuffer> buf,
|
| int buf_len) {
|
| - ssize_t res = HANDLE_EINTR(write(file_.GetPlatformFile(), buf->data(),
|
| - buf_len));
|
| + ssize_t res =
|
| + HANDLE_EINTR(write(file_.GetPlatformFile(), buf->data(), buf_len));
|
| if (res == -1)
|
| return IOResult::FromOSError(errno);
|
|
|
|
|