diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:15:56 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:15:56 +0000 |
| commit | 65d55d8a39fa6d3438b8b14f4b7a5bd961728142 (patch) | |
| tree | 6c7dbb6c681c9221a44b91344c5ceda53db35f4a /net | |
| parent | 1c48541e7a183a418dca7f98a42a72723c178f81 (diff) | |
| download | chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.zip chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.tar.gz chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.tar.bz2 | |
Assorted fixes for 64-bit.
Review URL: http://codereview.chromium.org/160288
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/file_stream_posix.cc | 4 | ||||
| -rw-r--r-- | net/disk_cache/mapped_file_posix.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index fbfeb04..5c55781 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -382,7 +382,7 @@ int FileStream::Read( return ERR_UNEXPECTED; // read(..., 0) will return 0, which indicates end-of-file. - DCHECK(buf_len > 0 && buf_len <= SSIZE_MAX); + DCHECK(buf_len > 0); DCHECK(open_flags_ & base::PLATFORM_FILE_READ); if (async_context_.get()) { @@ -420,7 +420,7 @@ int FileStream::ReadUntilComplete(char *buf, int buf_len) { int FileStream::Write( const char* buf, int buf_len, CompletionCallback* callback) { // write(..., 0) will return 0, which indicates end-of-file. - DCHECK(buf_len > 0 && buf_len <= SSIZE_MAX); + DCHECK(buf_len > 0); if (!IsOpen()) return ERR_UNEXPECTED; diff --git a/net/disk_cache/mapped_file_posix.cc b/net/disk_cache/mapped_file_posix.cc index b9d8435..a28a7d4 100644 --- a/net/disk_cache/mapped_file_posix.cc +++ b/net/disk_cache/mapped_file_posix.cc @@ -23,8 +23,8 @@ void* MappedFile::Init(const std::wstring& name, size_t size) { buffer_ = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, platform_file(), 0); init_ = true; - DCHECK(reinterpret_cast<int>(buffer_) != -1); - if (reinterpret_cast<int>(buffer_) == -1) + DCHECK(reinterpret_cast<intptr_t>(buffer_) != -1); + if (reinterpret_cast<intptr_t>(buffer_) == -1) buffer_ = 0; view_size_ = size; |