diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 23:19:33 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 23:19:33 +0000 |
| commit | b1f031ddf0723e5a4811bf9fa6fdda68c97633de (patch) | |
| tree | 81be42f2b7c8cbf8e2bb5aaea1f1b1a6213413ca /net/socket/tcp_client_socket_win.cc | |
| parent | 136ba26595ceafeb57a5c4d524caf7f87b95daf3 (diff) | |
| download | chromium_src-b1f031ddf0723e5a4811bf9fa6fdda68c97633de.zip chromium_src-b1f031ddf0723e5a4811bf9fa6fdda68c97633de.tar.gz chromium_src-b1f031ddf0723e5a4811bf9fa6fdda68c97633de.tar.bz2 | |
Use CHECK_* in net
Review URL: http://codereview.chromium.org/660404
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_win.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_win.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc index 1ec8b28..b1270bb 100644 --- a/net/socket/tcp_client_socket_win.cc +++ b/net/socket/tcp_client_socket_win.cc @@ -35,7 +35,7 @@ bool ResetEventIfSignaled(WSAEVENT hEvent) { DWORD wait_rv = WaitForSingleObject(hEvent, 0); if (wait_rv == WAIT_TIMEOUT) return false; // The event object is not signaled. - CHECK(wait_rv == WAIT_OBJECT_0); + CHECK_EQ(WAIT_OBJECT_0, wait_rv); BOOL ok = WSAResetEvent(hEvent); CHECK(ok); return true; @@ -459,7 +459,8 @@ int TCPClientSocketWin::Read(IOBuffer* buf, TRACE_EVENT_BEGIN("socket.read", this, ""); // TODO(wtc): Remove the CHECK after enough testing. - CHECK(WaitForSingleObject(core_->read_overlapped_.hEvent, 0) == WAIT_TIMEOUT); + CHECK_EQ(WAIT_TIMEOUT, + WaitForSingleObject(core_->read_overlapped_.hEvent, 0)); DWORD num, flags = 0; int rv = WSARecv(socket_, &core_->read_buffer_, 1, &num, &flags, &core_->read_overlapped_, NULL); @@ -496,8 +497,7 @@ int TCPClientSocketWin::Write(IOBuffer* buf, DCHECK_NE(socket_, INVALID_SOCKET); DCHECK(!waiting_write_); DCHECK(!write_callback_); - //TODO(vandebo) change back to a DCHECK when 27870 is resolved - CHECK(buf_len > 0); + DCHECK_GT(buf_len, 0); DCHECK(!core_->write_iobuffer_); static StatsCounter reads("tcp.writes"); @@ -509,8 +509,8 @@ int TCPClientSocketWin::Write(IOBuffer* buf, TRACE_EVENT_BEGIN("socket.write", this, ""); // TODO(wtc): Remove the CHECK after enough testing. - CHECK( - WaitForSingleObject(core_->write_overlapped_.hEvent, 0) == WAIT_TIMEOUT); + CHECK_EQ(WAIT_TIMEOUT, + WaitForSingleObject(core_->write_overlapped_.hEvent, 0)); DWORD num; int rv = WSASend(socket_, &core_->write_buffer_, 1, &num, 0, &core_->write_overlapped_, NULL); |