diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-12-17 13:01:12 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-12-17 13:01:12 +0000 |
| commit | f7ac7ef37efe04eedc5650042d20fbe558cec210 (patch) | |
| tree | 41338d185b8a542c7add104f6bf8e1f5fc9f9ea1 /epan/dissectors/packet-dtn.c | |
| parent | 96659d0252075a93ca806999377f41530d816990 (diff) | |
| download | wireshark-f7ac7ef37efe04eedc5650042d20fbe558cec210.tar.gz wireshark-f7ac7ef37efe04eedc5650042d20fbe558cec210.tar.bz2 wireshark-f7ac7ef37efe04eedc5650042d20fbe558cec210.zip | |
Switched to bitwise | instead of logical || in bit operations.
This bug was found by clang.
svn path=/trunk/; revision=35209
Diffstat (limited to 'epan/dissectors/packet-dtn.c')
| -rw-r--r-- | epan/dissectors/packet-dtn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 2f7522dfab..6659e1ad80 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -444,7 +444,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int field_length; if((conv_hdr & - ~(TCP_CONVERGENCE_TYPE_MASK || TCP_CONVERGENCE_SHUTDOWN_FLAGS)) != 0) { + ~(TCP_CONVERGENCE_TYPE_MASK | TCP_CONVERGENCE_SHUTDOWN_FLAGS)) != 0) { proto_tree_add_text(conv_tree, tvb, frame_offset, -1, "Invalid Convergence Layer Shutdown Packet"); return; |