diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 23:43:03 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 23:43:03 +0000 |
| commit | 7856bb83df917cfaebfe7881dc620bf264a94885 (patch) | |
| tree | 441a77bf222db624ec3c3bbf58f0f3f9698befd9 /base/file_util_win.cc | |
| parent | 6d2b8132aaa55a9e01b8b49bcce5eb44c68a1972 (diff) | |
| download | chromium_src-7856bb83df917cfaebfe7881dc620bf264a94885.zip chromium_src-7856bb83df917cfaebfe7881dc620bf264a94885.tar.gz chromium_src-7856bb83df917cfaebfe7881dc620bf264a94885.tar.bz2 | |
revert r6938
(i.e. reapply 6935, with fix)
Review URL: http://codereview.chromium.org/14087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_win.cc')
| -rw-r--r-- | base/file_util_win.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/base/file_util_win.cc b/base/file_util_win.cc index c287129..8f372b1 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -704,22 +704,6 @@ MemoryMappedFile::MemoryMappedFile() length_(INVALID_FILE_SIZE) { } -MemoryMappedFile::~MemoryMappedFile() { - CloseHandles(); -} - -bool MemoryMappedFile::Initialize(const FilePath& file_name) { - if (IsValid()) - return false; - - if (!MapFileToMemory(file_name)) { - CloseHandles(); - return false; - } - - return true; -} - bool MemoryMappedFile::MapFileToMemory(const FilePath& file_name) { file_ = ::CreateFile(file_name.value().c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, @@ -736,15 +720,11 @@ bool MemoryMappedFile::MapFileToMemory(const FilePath& file_name) { if (file_mapping_ == INVALID_HANDLE_VALUE) return false; - data_ = reinterpret_cast<const uint8*>( + data_ = static_cast<uint8*>( ::MapViewOfFile(file_mapping_, FILE_MAP_READ, 0, 0, length_)); return data_ != NULL; } -bool MemoryMappedFile::IsValid() { - return data_ != NULL; -} - void MemoryMappedFile::CloseHandles() { if (data_) ::UnmapViewOfFile(data_); |