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

webrtc/rtc_base/opensslstreamadapter.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 537 matching lines @@
     return SR_SUCCESS;
   }
 
   ssl_write_needs_read_ = false;
 
   int code = SSL_write(ssl_, data, checked_cast<int>(data_len));
   int ssl_error = SSL_get_error(ssl_, code);
   switch (ssl_error) {
   case SSL_ERROR_NONE:
     LOG(LS_VERBOSE) << " -- success";
-    RTC_DCHECK(0 < code && static_cast<unsigned>(code) <= data_len);
+    RTC_DCHECK_GE(code, 0);

[mflodman, 2017/08/09 15:27:07]

RTC_DCHECK_GT

[kwiberg-webrtc, 2017/08/09 22:06:07]

Done.

+    RTC_DCHECK_LE(code, data_len);
     if (written)
       *written = code;
     return SR_SUCCESS;
   case SSL_ERROR_WANT_READ:
     LOG(LS_VERBOSE) << " -- error want read";
     ssl_write_needs_read_ = true;
     return SR_BLOCK;
   case SSL_ERROR_WANT_WRITE:
     LOG(LS_VERBOSE) << " -- error want write";
     return SR_BLOCK;
@@ skipping 43 matching lines @@
     return SR_SUCCESS;
   }
 
   ssl_read_needs_write_ = false;
 
   int code = SSL_read(ssl_, data, checked_cast<int>(data_len));
   int ssl_error = SSL_get_error(ssl_, code);
   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;
 
       if (ssl_mode_ == SSL_MODE_DTLS) {
         // Enforce atomic reads -- this is a short read
         unsigned int pending = SSL_pending(ssl_);
 
         if (pending) {
           LOG(LS_INFO) << " -- short DTLS read. flushing";
           FlushInput(pending);
@@ skipping 577 matching lines @@
   }
 
   return false;
 }
 
 void OpenSSLStreamAdapter::enable_time_callback_for_testing() {
   g_use_time_callback_for_testing = true;
 }
 
 }  // namespace rtc