diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-01-31 18:58:38 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-01-31 18:58:38 +0000 |
| commit | ed78f0a33ec586b5135d03c5178a112a7c161ac0 (patch) | |
| tree | 0b47e92ebdcbe72f7251c718be0173681324e260 | |
| parent | 88d53d925f9cbbdd88ccb2d0060c61cd0a8229b0 (diff) | |
Fix two cases of 'if (x = y)' which should be 'if (x == y)'.
Found by reviewing msvc level 4 warnings "assignment within conditional expression".
(Unfortunately most of the warnings are false positives so this warning can't be enabled)
svn path=/trunk/; revision=35726
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 2 | ||||
| -rw-r--r-- | gtk/voip_calls.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 6a8a2ac8bc..81bb3fd855 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -5348,7 +5348,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s else if ((val8 >= 0x20) && (val8 <= 0x7E)) { /* No extended ASCII, 0-9, A-Z, a-z */ } - else if ((i == vl_max -1) && (val8 = 0x00)) { + else if ((i == vl_max -1) && (val8 == 0x00)) { /* Last Byte can be null*/ is_padded = TRUE; } diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index ec3338445e..e6518a8f10 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -2481,7 +2481,7 @@ MGCPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co } /* if there is a Busy or ReorderTone, and the call was Ringing or Setup the call is Rejected */ - if ( (isSignal("ro", pi->signalReq) || isSignal("bz", pi->signalReq)) && ((callsinfo->call_state == VOIP_CALL_SETUP) || (callsinfo->call_state = VOIP_RINGING)) ) { + if ( (isSignal("ro", pi->signalReq) || isSignal("bz", pi->signalReq)) && ((callsinfo->call_state == VOIP_CALL_SETUP) || (callsinfo->call_state == VOIP_RINGING)) ) { callsinfo->call_state = VOIP_REJECTED; } |