diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 19:30:27 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 19:30:27 +0000 |
| commit | ed65fece343181e91b4d36e161434cc763475de7 (patch) | |
| tree | 27af7d7cb8a12f65b24dba3ebd5ede3d592e2d8e /net/base | |
| parent | 2d723bc66e60bedd617ebd464996ee2388c0c365 (diff) | |
| download | chromium_src-ed65fece343181e91b4d36e161434cc763475de7.zip chromium_src-ed65fece343181e91b4d36e161434cc763475de7.tar.gz chromium_src-ed65fece343181e91b4d36e161434cc763475de7.tar.bz2 | |
Add an optional parameter to CreatePlatformFile() to report the type
of error that occured while trying to open/create a file.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3223007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/file_stream_posix.cc | 2 | ||||
| -rw-r--r-- | net/base/file_stream_unittest.cc | 5 | ||||
| -rw-r--r-- | net/base/file_stream_win.cc | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index ba91db2..d338c14 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -345,7 +345,7 @@ int FileStream::Open(const FilePath& path, int open_flags) { } open_flags_ = open_flags; - file_ = base::CreatePlatformFile(path, open_flags_, NULL); + file_ = base::CreatePlatformFile(path, open_flags_, NULL, NULL); if (file_ == base::kInvalidPlatformFileValue) { LOG(WARNING) << "Failed to open file: " << errno << " (" << path.ToWStringHack() << ")"; diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc index cf80699..b93d886 100644 --- a/net/base/file_stream_unittest.cc +++ b/net/base/file_stream_unittest.cc @@ -51,7 +51,7 @@ TEST_F(FileStreamTest, UseFileHandle) { file_util::WriteFile(temp_file_path(), kTestData, kTestDataSize)); int flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_READ; base::PlatformFile file = base::CreatePlatformFile( - temp_file_path().ToWStringHack(), flags, &created); + temp_file_path(), flags, &created, NULL); // Seek to the beginning of the file and read. net::FileStream read_stream(file, flags); @@ -66,8 +66,7 @@ TEST_F(FileStreamTest, UseFileHandle) { // 2. Test writing with a file handle. file_util::Delete(temp_file_path(), false); flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_WRITE; - file = base::CreatePlatformFile(temp_file_path().ToWStringHack(), - flags, &created); + file = base::CreatePlatformFile(temp_file_path(), flags, &created, NULL); net::FileStream write_stream(file, flags); ASSERT_EQ(0, write_stream.Seek(net::FROM_BEGIN, 0)); diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc index 0460b3d..234ddf9 100644 --- a/net/base/file_stream_win.cc +++ b/net/base/file_stream_win.cc @@ -159,7 +159,7 @@ int FileStream::Open(const FilePath& path, int open_flags) { } open_flags_ = open_flags; - file_ = base::CreatePlatformFile(path.value(), open_flags_, NULL); + file_ = base::CreatePlatformFile(path, open_flags_, NULL, NULL); if (file_ == INVALID_HANDLE_VALUE) { DWORD error = GetLastError(); LOG(WARNING) << "Failed to open file: " << error; |