diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-07-14 14:33:01 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-07-14 12:34:29 +0000 |
commit | 644c009556667ee4f75bc9e27e56d2eea55345cf (patch) | |
tree | b93c2e17558c34edf609fd5a828fb6547c66ff18 | |
parent | 4eecdff6ca6aaa2bb4c35c526ffff0fb1ce71a70 (diff) | |
download | wireshark-644c009556667ee4f75bc9e27e56d2eea55345cf.tar.gz wireshark-644c009556667ee4f75bc9e27e56d2eea55345cf.tar.bz2 wireshark-644c009556667ee4f75bc9e27e56d2eea55345cf.zip |
ETAG: add explicit casts to please OSX buildbot
Change-Id: I057ffc6eb5e6c16e05b0ddc1c069159980678b85
Reviewed-on: https://code.wireshark.org/review/16429
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r-- | epan/dissectors/packet-etag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-etag.c b/epan/dissectors/packet-etag.c index 98ed113ebe..ad9401bb2e 100644 --- a/epan/dissectors/packet-etag.c +++ b/epan/dissectors/packet-etag.c @@ -144,8 +144,8 @@ dissect_etag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *ti = proto_tree_add_item(tree, proto_etag, tvb, 0, IEEE8021BR_LEN - 2, ENC_NA); - e_cid = (((tci >> 16) & 0xFFF) | (tci << 12)) & 0xFFFFF; /* E-CID_base | E-CID_ext */ - ing_e_cid = (((tci >> 32) & 0xFFF) | ((tci << 4) & 0xFF000)) & 0xFFFFF; /* Ingress_E-CID_base | Ingress_E-CID ext */ + e_cid = (guint32)((((tci >> 16) & 0xFFF) | (tci << 12)) & 0xFFFFF); /* E-CID_base | E-CID_ext */ + ing_e_cid = (guint32)((((tci >> 32) & 0xFFF) | ((tci << 4) & 0xFF000)) & 0xFFFFF); /* Ingress_E-CID_base | Ingress_E-CID ext */ if (etag_summary_in_tree) { proto_item_append_text(ti, ", TCI: 0x%" G_GINT64_MODIFIER "x Ingress_E-CID: %u E-CID: %u", tci, ing_e_cid, e_cid); |