diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-03-28 12:40:49 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-03-28 12:40:49 +0000 |
| commit | eb70993a50c5c85b61d7b1cf9e4a7d6e5eb9a901 (patch) | |
| tree | 80da36acae051eaab8cf46f1cd7efbf2ed7f0213 /main | |
| parent | c0ff16036a6619e819db95199e619505696f5556 (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index c8abeb215..5efa11870 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4112,14 +4112,14 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) 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; |