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}
diff --git a/webrtc/pc/datachannel.cc b/webrtc/pc/datachannel.cc
index ce0aa14..28c090d 100644
--- a/webrtc/pc/datachannel.cc
+++ b/webrtc/pc/datachannel.cc
@@ -282,8 +282,9 @@
}
void DataChannel::SetSctpSid(int sid) {
- RTC_DCHECK(config_.id < 0 && sid >= 0 &&
- data_channel_type_ == cricket::DCT_SCTP);
+ RTC_DCHECK_LT(config_.id, 0);
+ RTC_DCHECK_GE(sid, 0);
+ RTC_DCHECK_EQ(data_channel_type_, cricket::DCT_SCTP);
if (config_.id == sid) {
return;
}
@@ -618,8 +619,10 @@
bool DataChannel::SendControlMessage(const rtc::CopyOnWriteBuffer& buffer) {
bool is_open_message = handshake_state_ == kHandshakeShouldSendOpen;
- RTC_DCHECK(data_channel_type_ == cricket::DCT_SCTP && writable_ &&
- config_.id >= 0 && (!is_open_message || !config_.negotiated));
+ RTC_DCHECK_EQ(data_channel_type_, cricket::DCT_SCTP);
+ RTC_DCHECK(writable_);
+ RTC_DCHECK_GE(config_.id, 0);
+ RTC_DCHECK(!is_open_message || !config_.negotiated);
cricket::SendDataParams send_params;
send_params.sid = config_.id;
diff --git a/webrtc/pc/remoteaudiosource.cc b/webrtc/pc/remoteaudiosource.cc
index 8d1a5d0..f6f23c3 100644
--- a/webrtc/pc/remoteaudiosource.cc
+++ b/webrtc/pc/remoteaudiosource.cc
@@ -96,7 +96,8 @@
}
void RemoteAudioSource::SetVolume(double volume) {
- RTC_DCHECK(volume >= 0 && volume <= 10);
+ RTC_DCHECK_GE(volume, 0);
+ RTC_DCHECK_LE(volume, 10);
for (auto* observer : audio_observers_)
observer->OnSetVolume(volume);
}
diff --git a/webrtc/pc/rtpreceiver.cc b/webrtc/pc/rtpreceiver.cc
index c6a2128..99c4010 100644
--- a/webrtc/pc/rtpreceiver.cc
+++ b/webrtc/pc/rtpreceiver.cc
@@ -53,7 +53,8 @@
}
void AudioRtpReceiver::OnSetVolume(double volume) {
- RTC_DCHECK(volume >= 0 && volume <= 10);
+ RTC_DCHECK_GE(volume, 0);
+ RTC_DCHECK_LE(volume, 10);
cached_volume_ = volume;
if (!channel_) {
LOG(LS_ERROR) << "AudioRtpReceiver::OnSetVolume: No audio channel exists.";
diff --git a/webrtc/pc/rtpsender.cc b/webrtc/pc/rtpsender.cc
index a16a28c..9d920e6 100644
--- a/webrtc/pc/rtpsender.cc
+++ b/webrtc/pc/rtpsender.cc
@@ -243,7 +243,8 @@
}
void AudioRtpSender::SetAudioSend() {
- RTC_DCHECK(!stopped_ && can_send_track());
+ RTC_DCHECK(!stopped_);
+ RTC_DCHECK(can_send_track());
if (!channel_) {
LOG(LS_ERROR) << "SetAudioSend: No audio channel exists.";
return;
@@ -430,7 +431,8 @@
}
void VideoRtpSender::SetVideoSend() {
- RTC_DCHECK(!stopped_ && can_send_track());
+ RTC_DCHECK(!stopped_);
+ RTC_DCHECK(can_send_track());
if (!channel_) {
LOG(LS_ERROR) << "SetVideoSend: No video channel exists.";
return;
diff --git a/webrtc/pc/test/fakedatachannelprovider.h b/webrtc/pc/test/fakedatachannelprovider.h
index 89bb987..ecc0aa6 100644
--- a/webrtc/pc/test/fakedatachannelprovider.h
+++ b/webrtc/pc/test/fakedatachannelprovider.h
@@ -26,7 +26,8 @@
bool SendData(const cricket::SendDataParams& params,
const rtc::CopyOnWriteBuffer& payload,
cricket::SendDataResult* result) override {
- RTC_CHECK(ready_to_send_ && transport_available_);
+ RTC_CHECK(ready_to_send_);
+ RTC_CHECK(transport_available_);
if (send_blocked_) {
*result = cricket::SDR_BLOCK;
return false;
diff --git a/webrtc/pc/test/fakertccertificategenerator.h b/webrtc/pc/test/fakertccertificategenerator.h
index 39b9107..7b47378 100644
--- a/webrtc/pc/test/fakertccertificategenerator.h
+++ b/webrtc/pc/test/fakertccertificategenerator.h
@@ -151,12 +151,12 @@
if (should_fail_) {
msg_id = MSG_FAILURE;
} else if (key_params.type() == rtc::KT_RSA) {
- RTC_DCHECK(key_params.rsa_params().mod_size == 1024 &&
- key_params.rsa_params().pub_exp == 0x10001);
+ RTC_DCHECK_EQ(key_params.rsa_params().mod_size, 1024);
+ RTC_DCHECK_EQ(key_params.rsa_params().pub_exp, 0x10001);
msg_id = MSG_SUCCESS_RSA;
} else {
- RTC_DCHECK(key_params.type() == rtc::KT_ECDSA &&
- key_params.ec_curve() == rtc::EC_NIST_P256);
+ RTC_DCHECK_EQ(key_params.type(), rtc::KT_ECDSA);
+ RTC_DCHECK_EQ(key_params.ec_curve(), rtc::EC_NIST_P256);
msg_id = MSG_SUCCESS_ECDSA;
}
rtc::Thread::Current()->Post(RTC_FROM_HERE, this, msg_id, msg);
