From 05f9ccdf23a1075ae03e439c76503c010bbd186f Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Tue, 27 Oct 2020 11:30:19 +0100 Subject: [PATCH] unify "control reaches end of non-void function" style BUG=webrtc:12008 Change-Id: I1cabe99738b3968af60a305bd9593bd47f7e9b6b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190480 Commit-Queue: Karl Wiberg Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#32506} --- api/media_types.cc | 4 +--- pc/peer_connection_factory.cc | 6 ++---- pc/rtp_parameters_conversion.cc | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/api/media_types.cc b/api/media_types.cc index c7635b52de..4ab80edbf9 100644 --- a/api/media_types.cc +++ b/api/media_types.cc @@ -31,9 +31,7 @@ std::string MediaTypeToString(MediaType type) { RTC_NOTREACHED(); return ""; } - FATAL(); - // Not reachable; avoids compile warning. - return ""; + RTC_CHECK(false); } } // namespace cricket diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc index 237c84d3ff..fec600a01c 100644 --- a/pc/peer_connection_factory.cc +++ b/pc/peer_connection_factory.cc @@ -140,8 +140,7 @@ RtpCapabilities PeerConnectionFactory::GetRtpSenderCapabilities( case cricket::MEDIA_TYPE_UNSUPPORTED: return RtpCapabilities(); } - // Not reached; avoids compile warning. - FATAL(); + RTC_CHECK(false); } RtpCapabilities PeerConnectionFactory::GetRtpReceiverCapabilities( @@ -167,8 +166,7 @@ RtpCapabilities PeerConnectionFactory::GetRtpReceiverCapabilities( case cricket::MEDIA_TYPE_UNSUPPORTED: return RtpCapabilities(); } - // Not reached; avoids compile warning. - FATAL(); + RTC_CHECK(false); } rtc::scoped_refptr diff --git a/pc/rtp_parameters_conversion.cc b/pc/rtp_parameters_conversion.cc index 9c7a337ab4..80e56b896f 100644 --- a/pc/rtp_parameters_conversion.cc +++ b/pc/rtp_parameters_conversion.cc @@ -76,8 +76,7 @@ RTCErrorOr ToCricketFeedbackParam( } return cricket::FeedbackParam(cricket::kRtcpFbParamTransportCc); } - // Not reached; avoids compile warning. - FATAL(); + RTC_CHECK(false); } template