diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:18:31 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:18:31 +0000 |
| commit | 640b17dd89a5dc62c2e096e8178679865bd3aaca (patch) | |
| tree | 894724f48f15d3e07a16d9847054da7458ff27d4 | |
| parent | 1d803dbe9e9c220c92318862e515d25c09c225e1 (diff) | |
Fix logic errors from 208746
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@208923 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 2 | ||||
| -rw-r--r-- | main/translate.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index a7f008f2b..0bdc40176 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3722,7 +3722,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha return AST_BRIDGE_FAILED; } /* Put them in native bridge mode */ - if ((!flags) & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) { + if (!(flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))) { iaxs[callno0]->bridgecallno = callno1; iaxs[callno1]->bridgecallno = callno0; } diff --git a/main/translate.c b/main/translate.c index e801e0e44..5c92dee57 100644 --- a/main/translate.c +++ b/main/translate.c @@ -920,7 +920,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src destination format. */ for (x = 1; src_audio && x < AST_FORMAT_MAX_AUDIO; x <<= 1) { /* if this is not a desired format, nothing to do */ - if ((!dest) & x) + if (!(dest & x)) continue; /* if the source is supplying this format, then @@ -946,7 +946,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src destination format. */ for (; src_video && x < AST_FORMAT_MAX_VIDEO; x <<= 1) { /* if this is not a desired format, nothing to do */ - if ((!dest) & x) + if (!(dest & x)) continue; /* if the source is supplying this format, then |