diff options
author | Evan Huus <eapache@gmail.com> | 2014-09-08 19:52:56 -0400 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2014-09-08 23:54:26 +0000 |
commit | f9bfa976e67da2f8065f172de9ed06fad61762a8 (patch) | |
tree | a09e11e2058eba65e9514877663d939f90d1be7f | |
parent | e8491ce72916dfb480760f7e270d08d25ecfc544 (diff) |
Explicitly lengthen some constants to 64 bits
Hopefully squashes the mac buildbot error
packet-mp2t.c:993: warning: implicit conversion shortens 64-bit value into a
32-bit value
Change-Id: I9ca6420925442b56cfdf5db629b63d6ead7bdfbd
Reviewed-on: https://code.wireshark.org/review/4045
Reviewed-by: Evan Huus <eapache@gmail.com>
-rw-r--r-- | epan/dissectors/packet-mp2t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index f1d83795a9..3ea7c0b470 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -976,7 +976,7 @@ dissect_mp2t_adaptation_field(tvbuff_t *tvb, gint offset, proto_tree *tree) /* 33 bit PCR base, 6 bit reserved, 9 bit PCR ext */ pcr_base = tvb_get_ntoh48(tvb, offset) >> (48-33); - pcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & 0x1FF); + pcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & G_GUINT64_CONSTANT(0x1FF)); proto_tree_add_uint64(mp2t_af_tree, hf_mp2t_af_pcr, tvb, offset, 6, pcr_base*300 + pcr_ext); @@ -990,7 +990,7 @@ dissect_mp2t_adaptation_field(tvbuff_t *tvb, gint offset, proto_tree *tree) /* the same format as PCR above */ opcr_base = tvb_get_ntoh48(tvb, offset) >> (48-33); - opcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & 0x1FF); + opcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & G_GUINT64_CONSTANT(0x1FF)); proto_tree_add_uint64(mp2t_af_tree, hf_mp2t_af_opcr, tvb, offset, 6, opcr_base*300 + opcr_ext); |