diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-06-17 13:39:56 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-06-17 13:39:56 +0000 |
| commit | e28a15e6eca581422bf7a03b8d5b4309609d835f (patch) | |
| tree | 04adc2970eaaee5b32e96f11d863d6025681a53d | |
| parent | a2106225add5eff9f9f4909ea5df17f27bc0afb8 (diff) | |
Added some casts from spotlight_ntoh64 to guint.
svn path=/trunk/; revision=37694
| -rw-r--r-- | epan/dissectors/packet-afp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index d3b2716a12..71f96f86bd 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -3996,8 +3996,8 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) "Big Endian" : "Litte Endian"); offset += 8; - toc_offset = (spotlight_ntoh64(tvb, offset) >> 32) * 8 - 8; - querylen = (spotlight_ntoh64(tvb, offset) & 0xffffffff) * 8 - 8; + toc_offset = (gint)(spotlight_ntoh64(tvb, offset) >> 32) * 8 - 8; + querylen = (gint)(spotlight_ntoh64(tvb, offset) & 0xffffffff) * 8 - 8; proto_tree_add_text(tree, tvb, offset, @@ -4018,7 +4018,7 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree_queries = proto_item_add_subtree(item_queries_data, ett_afp_spotlight_queries); /* Queries */ - query_offset_next = (spotlight_ntoh64(tvb, offset + toc_offset + 8) & 0xff) * 8 - 16; + query_offset_next = (gint)(spotlight_ntoh64(tvb, offset + toc_offset + 8) & 0xff) * 8 - 16; for (i = 0; i < num_queries; i++) { query_offset = query_offset_next; if (i == num_queries - 1) @@ -4026,7 +4026,7 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) query_offset_next = toc_offset; else /* peek at next offset */ - query_offset_next = (spotlight_ntoh64(tvb, offset + toc_offset + 8 + (i+1)*8) & 0xff) * 8 - 16; + query_offset_next = (gint)(spotlight_ntoh64(tvb, offset + toc_offset + 8 + (i+1)*8) & 0xff) * 8 - 16; /* this is obviously the length of one query */ query_data_len = query_offset_next - query_offset; @@ -4063,7 +4063,7 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) if (query_data_len > 8) { /* populate the query tree */ query_data64 = spotlight_ntoh64(tvb, offset + query_offset + 8); - mdlen = ((query_data64 & 0xffff) - 1) * 8; + mdlen = (gint)((query_data64 & 0xffff) - 1) * 8; proto_tree_add_text(sub_tree_query, tvb, offset + query_offset + 8, |