Author: mjordan Date: Sat Mar 28 07:41:24 2015 New Revision: 433689 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433689 Log: clang compiler warnings: Fix -Wparantheses-equality warnings
Clang will treat ((a == b)) as a warning, as it reasonably expects that the developer may have intended to write (a == b) or ((a = b)). This patch cleans up all instances where equality, not assignment, was intended between two parantheses. Review: https://reviewboard.asterisk.org/r/4531/ ASTERISK-24917 Repoted by: dkdegroot patches: rb4531.patch submitted by dkdegroot (License 6600) ........ Merged revisions 433687 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 433688 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/apps/app_dictate.c trunk/apps/app_voicemail.c trunk/main/channel.c trunk/res/Makefile trunk/utils/Makefile Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/apps/app_dictate.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dictate.c?view=diff&rev=433689&r1=433688&r2=433689 ============================================================================== --- trunk/apps/app_dictate.c (original) +++ trunk/apps/app_dictate.c Sat Mar 28 07:41:24 2015 @@ -175,7 +175,7 @@ ast_queue_frame(chan, &fr); digit = 0; } - if ((f->frametype == AST_FRAME_DTMF)) { + if (f->frametype == AST_FRAME_DTMF) { int got = 1; switch(mode) { case DMODE_PLAY: Modified: trunk/apps/app_voicemail.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=433689&r1=433688&r2=433689 ============================================================================== --- trunk/apps/app_voicemail.c (original) +++ trunk/apps/app_voicemail.c Sat Mar 28 07:41:24 2015 @@ -9099,7 +9099,7 @@ if (!res) res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, ast_channel_language(chan), NULL); if (!res) { - if ((vms->newmessages == 1)) { + if (vms->newmessages == 1) { res = ast_play_and_wait(chan, "vm-INBOX"); if (!res) res = ast_play_and_wait(chan, "vm-message"); @@ -9113,7 +9113,7 @@ res = ast_play_and_wait(chan, "vm-youhave"); if (!res) res = ast_say_number(chan, vms->oldmessages, AST_DIGIT_ANY, ast_channel_language(chan), NULL); - if ((vms->oldmessages == 1)){ + if (vms->oldmessages == 1){ res = ast_play_and_wait(chan, "vm-Old"); if (!res) res = ast_play_and_wait(chan, "vm-message"); @@ -9344,7 +9344,7 @@ if ((vms->oldmessages || vms->newmessages) && !res) { res = ast_play_and_wait(chan, "vm-and"); } else if (!res) { - if ((vms->urgentmessages == 1)) + if (vms->urgentmessages == 1) res = ast_play_and_wait(chan, "vm-message"); else res = ast_play_and_wait(chan, "vm-messages"); @@ -9357,7 +9357,7 @@ if (vms->oldmessages && !res) res = ast_play_and_wait(chan, "vm-and"); else if (!res) { - if ((vms->newmessages == 1)) + if (vms->newmessages == 1) res = ast_play_and_wait(chan, "vm-message"); else res = ast_play_and_wait(chan, "vm-messages"); @@ -9509,7 +9509,7 @@ } if (vms->newmessages) { - if ((vms->newmessages == 1)) { + if (vms->newmessages == 1) { res = ast_play_and_wait(chan, "digits/ett"); res = res ? res : ast_play_and_wait(chan, "vm-nytt"); res = res ? res : ast_play_and_wait(chan, "vm-message"); @@ -9553,7 +9553,7 @@ } if (vms->newmessages) { - if ((vms->newmessages == 1)) { + if (vms->newmessages == 1) { res = ast_play_and_wait(chan, "digits/1"); res = res ? res : ast_play_and_wait(chan, "vm-ny"); res = res ? res : ast_play_and_wait(chan, "vm-message"); @@ -9588,7 +9588,7 @@ res = ast_play_and_wait(chan, "vm-youhave"); if (!res) { if (vms->newmessages) { - if ((vms->newmessages == 1)) + if (vms->newmessages == 1) res = ast_play_and_wait(chan, "digits/1F"); else res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan)); @@ -9597,7 +9597,7 @@ if (vms->oldmessages && !res) res = ast_play_and_wait(chan, "vm-and"); else if (!res) { - if ((vms->newmessages == 1)) + if (vms->newmessages == 1) res = ast_play_and_wait(chan, "vm-message"); else res = ast_play_and_wait(chan, "vm-messages"); @@ -9644,7 +9644,7 @@ if (!res) { if (vms->newmessages) { if (!res) { - if ((vms->newmessages == 1)) { + if (vms->newmessages == 1) { res = ast_play_and_wait(chan, "digits/1M"); if (!res) res = ast_play_and_wait(chan, "vm-message"); @@ -9695,7 +9695,7 @@ if (vms->newmessages) { if (!res) res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, ast_channel_language(chan), "f"); - if ((vms->newmessages == 1)) { + if (vms->newmessages == 1) { if (!res) res = ast_play_and_wait(chan, "vm-message"); if (!res) @@ -9741,7 +9741,7 @@ if (vms->oldmessages && !res) res = ast_play_and_wait(chan, "vm-and"); else if (!res) { - if ((vms->newmessages == 1)) + if (vms->newmessages == 1) res = ast_play_and_wait(chan, "vm-message"); else res = ast_play_and_wait(chan, "vm-messages"); @@ -9788,7 +9788,7 @@ if (vms->oldmessages && !res) res = ast_play_and_wait(chan, "vm-and"); else if (!res) { - if ((vms->newmessages == 1)) + if (vms->newmessages == 1) res = ast_play_and_wait(chan, "vm-message"); else res = ast_play_and_wait(chan, "vm-messages"); @@ -9831,7 +9831,7 @@ if (vms->newmessages) { res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, ast_channel_language(chan), "f"); if (!res) { - if ((vms->newmessages == 1)) { + if (vms->newmessages == 1) { res = ast_play_and_wait(chan, "vm-message"); if (!res) res = ast_play_and_wait(chan, "vm-INBOXs"); @@ -9897,7 +9897,7 @@ res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan)); } if (!res) { - if ((vms->newmessages == 1)) + if (vms->newmessages == 1) res = ast_play_and_wait(chan, "vm-novou"); if ((vms->newmessages) > 1 && (vms->newmessages < 5)) res = ast_play_and_wait(chan, "vm-nove"); @@ -9907,7 +9907,7 @@ if (vms->oldmessages && !res) res = ast_play_and_wait(chan, "vm-and"); else if (!res) { - if ((vms->newmessages == 1)) + if (vms->newmessages == 1) res = ast_play_and_wait(chan, "vm-zpravu"); if ((vms->newmessages) > 1 && (vms->newmessages < 5)) res = ast_play_and_wait(chan, "vm-zpravy"); @@ -9918,7 +9918,7 @@ if (!res && vms->oldmessages) { res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan)); if (!res) { - if ((vms->oldmessages == 1)) + if (vms->oldmessages == 1) res = ast_play_and_wait(chan, "vm-starou"); if ((vms->oldmessages) > 1 && (vms->oldmessages < 5)) res = ast_play_and_wait(chan, "vm-stare"); @@ -9926,7 +9926,7 @@ res = ast_play_and_wait(chan, "vm-starych"); } if (!res) { - if ((vms->oldmessages == 1)) + if (vms->oldmessages == 1) res = ast_play_and_wait(chan, "vm-zpravu"); if ((vms->oldmessages) > 1 && (vms->oldmessages < 5)) res = ast_play_and_wait(chan, "vm-zpravy"); Modified: trunk/main/channel.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=433689&r1=433688&r2=433689 ============================================================================== --- trunk/main/channel.c (original) +++ trunk/main/channel.c Sat Mar 28 07:41:24 2015 @@ -4112,14 +4112,14 @@ ast_frfree(f); f = &ast_null_frame; } - } else if ((f->frametype == AST_FRAME_VOICE) && ast_format_cap_iscompatible_format(ast_channel_nativeformats(chan), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) { + } else if (f->frametype == AST_FRAME_VOICE && ast_format_cap_iscompatible_format(ast_channel_nativeformats(chan), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) { /* This frame is not one of the current native formats -- drop it on the floor */ struct ast_str *codec_buf = ast_str_alloca(64); ast_log(LOG_NOTICE, "Dropping incompatible voice frame on %s of format %s since our native format has changed to %s\n", ast_channel_name(chan), ast_format_get_name(f->subclass.format), ast_format_cap_get_names(ast_channel_nativeformats(chan), &codec_buf)); ast_frfree(f); f = &ast_null_frame; - } else if ((f->frametype == AST_FRAME_VOICE)) { + } else if (f->frametype == AST_FRAME_VOICE) { /* Send frame to audiohooks if present */ if (ast_channel_audiohooks(chan)) { struct ast_frame *old_frame = f; Modified: trunk/res/Makefile URL: http://svnview.digium.com/svn/asterisk/trunk/res/Makefile?view=diff&rev=433689&r1=433688&r2=433689 ============================================================================== --- trunk/res/Makefile (original) +++ trunk/res/Makefile Sat Mar 28 07:41:24 2015 @@ -33,6 +33,9 @@ ael/ael.tab.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h ael/ael.tab.o: _ASTCFLAGS+=-I. -Iael -DYYENABLE_NLS=0 + ifneq ($(AST_CLANG_BLOCKS),) + _ASTCFLAGS+=-Wno-parentheses-equality + endif $(if $(filter res_ais,$(EMBEDDED_MODS)),modules.link,res_ais.so): ais/clm.o ais/evt.o ais/clm.o ais/evt.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ais) Modified: trunk/utils/Makefile URL: http://svnview.digium.com/svn/asterisk/trunk/utils/Makefile?view=diff&rev=433689&r1=433688&r2=433689 ============================================================================== --- trunk/utils/Makefile (original) +++ trunk/utils/Makefile Sat Mar 28 07:41:24 2015 @@ -139,6 +139,9 @@ $(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@" $(CMD_PREFIX) cp "$<" "$@" aelbison.o: _ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0 + ifneq ($(AST_CLANG_BLOCKS),) + _ASTCFLAGS+=-Wno-parentheses-equality + endif pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c $(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@" -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
