diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-21 21:45:15 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-21 21:45:15 +0000 |
| commit | da4c5d1179de98452d0e36a34a41e45d7506a6c6 (patch) | |
| tree | 715c39790f4a511849d33106b08a497641a3df9e /chrome/renderer/net | |
| parent | d92c84f41f4635433aaffa6f2d5eb3ff8f5d3a9e (diff) | |
| download | chromium_src-da4c5d1179de98452d0e36a34a41e45d7506a6c6.zip chromium_src-da4c5d1179de98452d0e36a34a41e45d7506a6c6.tar.gz chromium_src-da4c5d1179de98452d0e36a34a41e45d7506a6c6.tar.bz2 | |
Include chrome/renderer/SConscript in Linux build. Patch by Paweł Hajdan jr
<phajdan.jr@gmail.com>. Review: http://codereview.chromium.org/7822.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/net')
| -rw-r--r-- | chrome/renderer/net/render_dns_queue.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/net/render_dns_queue.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/renderer/net/render_dns_queue.cc b/chrome/renderer/net/render_dns_queue.cc index 0f7a1bb..5a0b15e0 100644 --- a/chrome/renderer/net/render_dns_queue.cc +++ b/chrome/renderer/net/render_dns_queue.cc @@ -67,7 +67,8 @@ DnsQueue::PushResult DnsQueue::Push(const char* source, std::memcpy(&buffer_[dest], source, space_till_wrap); // Ensure caller didn't have embedded '\0' and also // ensure trailing sentinel was in place. - DCHECK(space_till_wrap == strlen(&buffer_[dest])); // Relies on sentinel. + // Relies on sentinel. + DCHECK(static_cast<size_t>(space_till_wrap) == strlen(&buffer_[dest])); length -= space_till_wrap; source += space_till_wrap; @@ -78,7 +79,8 @@ DnsQueue::PushResult DnsQueue::Push(const char* source, std::memcpy(&buffer_[dest], source, length); DCHECK(dest + length < buffer_sentinel_); buffer_[dest + length] = '\0'; // We need termination in our buffer. - DCHECK(length == strlen(&buffer_[dest])); // Preclude embedded '\0'. + // Preclude embedded '\0'. + DCHECK(static_cast<size_t>(length) == strlen(&buffer_[dest])); dest += length + 1; if (dest == buffer_sentinel_) diff --git a/chrome/renderer/net/render_dns_queue.h b/chrome/renderer/net/render_dns_queue.h index dad921d..a13be8c 100644 --- a/chrome/renderer/net/render_dns_queue.h +++ b/chrome/renderer/net/render_dns_queue.h @@ -75,8 +75,8 @@ class DnsQueue { private: bool Validate(); // Checks that all internal data is valid. - const BufferSize buffer_size_; // Size one smaller than allocated space. const scoped_array<char> buffer_; // Circular buffer, plus extra char ('\0'). + const BufferSize buffer_size_; // Size one smaller than allocated space. const BufferSize buffer_sentinel_; // Index of extra '\0' at end of buffer_. // If writable_ == readable_, then the buffer is empty. |