diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 12:49:27 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 11:50:48 +0000 |
| commit | 7bbb3ac24ded6ca6d6f6d206caa9cd371f799816 (patch) | |
| tree | 5f43deb3c427afc66c1ef19c25d73632d07aea16 | |
| parent | 3d6c13e48b886030792e93cb7baab90e1e4e007a (diff) | |
Try to make Mac OS X buildbot Happy
packet-ieee80211.c:8581: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-ieee80211.c:8582: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8583: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8584: warning: implicit conversion shortens 64-bit value into a 32-bit value
Change-Id: I8f8c5518239c7d6e55006abfca8d9452f9a09c6a
Reviewed-on: https://code.wireshark.org/review/733
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 00941c1ddd..d550b1fde7 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -8578,10 +8578,11 @@ add_ff_cc_field(proto_tree *tree, tvbuff_t *tvb, int offset, gboolean dis) proto_tree_add_item(cc_tree, hf_ieee80211_ff_cc_abft_resp_addr, tvb, offset, 6, ENC_NA); } else { cc_field = tvb_get_letoh64(tvb, offset); - proto_tree_add_uint(cc_tree, hf_ieee80211_ff_cc_sp_duration, tvb, offset, 1, cc_field & 0xff); - proto_tree_add_uint64(cc_tree, hf_ieee80211_ff_cc_cluster_id, tvb, offset+1, 6, (cc_field & 0x00ffffffffffff00) >> 8); - proto_tree_add_uint(cc_tree, hf_ieee80211_ff_cc_role, tvb, offset+7, 1, (cc_field & 0x0300000000000000) >> 56); - proto_tree_add_uint(cc_tree, hf_ieee80211_ff_cc_max_mem, tvb, offset+7, 1, (cc_field & 0x7c00000000000000) >> 58); + /*TODO : Add support of bitmask for FT_(U)INT64 */ + proto_tree_add_uint(cc_tree, hf_ieee80211_ff_cc_sp_duration, tvb, offset, 1, (guint32)(cc_field & 0xff)); + proto_tree_add_uint64(cc_tree, hf_ieee80211_ff_cc_cluster_id, tvb, offset+1, 6, (guint64)((cc_field & 0x00ffffffffffff00) >> 8)); + proto_tree_add_uint(cc_tree, hf_ieee80211_ff_cc_role, tvb, offset+7, 1, (guint32)((cc_field & 0x0300000000000000) >> 56)); + proto_tree_add_uint(cc_tree, hf_ieee80211_ff_cc_max_mem, tvb, offset+7, 1, (guint32)((cc_field & 0x7c00000000000000) >> 58)); } return 8; } |