1383020 - mediaconduit_unittests.cpp: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else]

Status: RESOLVED FIXED

(Core :: WebRTC: Signaling, defect)

Description

[Sylvestre Ledru [:Sylvestre]]

Fails the build with gcc 7.1 & --enable-warnings-as-errors
35:47.40 /root/firefox-gcc-last/media/webrtc/signaling/gtest/mediaconduit_unittests.cpp: In member function 'void test::TransportConduitTest::TestDummyAudioAndTransport()':
35:47.40 /root/firefox-gcc-last/media/webrtc/signaling/gtest/mediaconduit_unittests.cpp:380:7: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else]
35:47.40      if( !mAudioSession )
35:47.40        ^
35:47.40 /root/firefox-gcc-last/media/webrtc/signaling/gtest/mediaconduit_unittests.cpp:384:7: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else]
35:47.40      if( !mAudioSession2 )
35:47.40        ^
35:47.42 /root/firefox-gcc-last/media/webrtc/signaling/gtest/mediaconduit_unittests.cpp: In member function 'void test::TransportConduitTest::TestVideoConduitCodecAPI()':
35:47.42 /root/firefox-gcc-last/media/webrtc/signaling/gtest/mediaconduit_unittests.cpp:439:7: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else]
35:47.42      if( !videoSession )
35:47.42        ^
35:47.44 /root/firefox-gcc-last/media/webrtc/signaling/gtest/mediaconduit_unittests.cpp: In member function 'void test::TransportConduitTest::GetVideoResolutionWithMaxFs(short unsigned int, short unsigned int, int, short unsigned int&, short unsigned int&)':
35:47.44 /root/firefox-gcc-last/media/webrtc/signaling/gtest/mediaconduit_unittests.cpp:560:7: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else]
35:47.44      if( !mVideoSession )
35:47.44        ^
35:49.95 cc1plus: all warnings being treated as errors

This is because ASSERT_NE is a macro and can be multiline. This could lead to the first line to be skipped and the second to be executed.

Comment 1

[Sylvestre Ledru [:Sylvestre]]

Attachment: Bug 1383020 - Add braces to avoid some -Wdangling-else warnings

ASSERT_NE can be on several lines

Review commit: https://reviewboard.mozilla.org/r/159780/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/159780/

Comment 2

[Randell Jesup [:jesup] (needinfo me)]

Comment on attachment 8888744 [details]
Bug 1383020 - Add braces to avoid some -Wdangling-else warnings

https://reviewboard.mozilla.org/r/159780/#review165124

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/95efad45c16f
Add braces to avoid some -Wdangling-else warnings r=jesup

Comment 4

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/95efad45c16f