commit ee89e7870c332c943fb78faebc63e47d0a314d74
author kwiberg <kwiberg@webrtc.org> Wed Aug 09 17:22:01 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Aug 10 00:22:01 2017 +0000
tree d07d0c04dfb5dff23549795eecdfdfa45c2f7fe8
parent 608e94a03f02e718f16f2d5ec96d3ff0aa9fde2f

Replace CHECK(x && y) with two separate CHECK() calls

That way, the debug printout will tell us which of x and y that was false.

BUG=none

Review-Url: https://codereview.webrtc.org/2988153003
Cr-Commit-Position: refs/heads/master@{#19297}

webrtc/rtc_base/macutils.cc

diff --git a/webrtc/rtc_base/macutils.cc b/webrtc/rtc_base/macutils.cc
index 282f782..2e5e1fb 100644
--- a/webrtc/rtc_base/macutils.cc
+++ b/webrtc/rtc_base/macutils.cc
@@ -72,7 +72,9 @@
 }
 
 static bool GetOSVersion(int* major, int* minor, int* bugfix) {
-  RTC_DCHECK(major && minor && bugfix);
+  RTC_DCHECK(major);
+  RTC_DCHECK(minor);
+  RTC_DCHECK(bugfix);
   struct utsname uname_info;
   if (uname(&uname_info) != 0)
     return false;

webrtc/rtc_base/opensslstreamadapter.cc

diff --git a/webrtc/rtc_base/opensslstreamadapter.cc b/webrtc/rtc_base/opensslstreamadapter.cc
index 1c0b578..53f35fc 100644
--- a/webrtc/rtc_base/opensslstreamadapter.cc
+++ b/webrtc/rtc_base/opensslstreamadapter.cc
@@ -555,7 +555,8 @@
   switch (ssl_error) {
   case SSL_ERROR_NONE:
     LOG(LS_VERBOSE) << " -- success";
-    RTC_DCHECK(0 < code && static_cast<unsigned>(code) <= data_len);
+    RTC_DCHECK_GT(code, 0);
+    RTC_DCHECK_LE(code, data_len);
     if (written)
       *written = code;
     return SR_SUCCESS;
@@ -619,7 +620,8 @@
   switch (ssl_error) {
     case SSL_ERROR_NONE:
       LOG(LS_VERBOSE) << " -- success";
-      RTC_DCHECK(0 < code && static_cast<unsigned>(code) <= data_len);
+      RTC_DCHECK_GT(code, 0);
+      RTC_DCHECK_LE(code, data_len);
       if (read)
         *read = code;
 

webrtc/rtc_base/proxyserver.cc

diff --git a/webrtc/rtc_base/proxyserver.cc b/webrtc/rtc_base/proxyserver.cc
index 18dceac..c00e243 100644
--- a/webrtc/rtc_base/proxyserver.cc
+++ b/webrtc/rtc_base/proxyserver.cc
@@ -43,7 +43,8 @@
 }
 
 void ProxyServer::OnAcceptEvent(AsyncSocket* socket) {
-  RTC_DCHECK(socket != nullptr && socket == server_socket_.get());
+  RTC_DCHECK(socket);
+  RTC_DCHECK_EQ(socket, server_socket_.get());
   AsyncSocket* int_socket = socket->Accept(nullptr);
   AsyncProxyServerSocket* wrapped_socket = WrapSocket(int_socket);
   AsyncSocket* ext_socket = ext_factory_->CreateAsyncSocket(ext_ip_.family(),
@@ -84,7 +85,8 @@
 
 void ProxyBinding::OnConnectRequest(AsyncProxyServerSocket* socket,
                                    const SocketAddress& addr) {
-  RTC_DCHECK(!connected_ && ext_socket_.get() != nullptr);
+  RTC_DCHECK(!connected_);
+  RTC_DCHECK(ext_socket_);
   ext_socket_->Connect(addr);
   // TODO: handle errors here
 }

webrtc/rtc_base/socketaddress.cc

diff --git a/webrtc/rtc_base/socketaddress.cc b/webrtc/rtc_base/socketaddress.cc
index 5b26b9f..8808414 100644
--- a/webrtc/rtc_base/socketaddress.cc
+++ b/webrtc/rtc_base/socketaddress.cc
@@ -9,6 +9,7 @@
  */
 
 #include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 #if defined(WEBRTC_POSIX)
 #include <sys/types.h>
@@ -120,8 +121,7 @@
 }
 
 void SocketAddress::SetPort(int port) {
-  RTC_DCHECK((0 <= port) && (port < 65536));
-  port_ = static_cast<uint16_t>(port);
+  port_ = rtc::dchecked_cast<uint16_t>(port);
 }
 
 uint32_t SocketAddress::ip() const {