diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-08-23 11:20:39 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-08-23 18:21:07 +0000 |
| commit | fd68385a2b36b7a22cd587c5731f883ef88884bc (patch) | |
| tree | ba256329ef31bc5629a4511b0b8b5148db49e907 /epan/dissectors/packet-cbor.c | |
| parent | a451c603dffd1c6e429200a8c5d6c3614adafb0f (diff) | |
Use G_GINT64_MODIFIER, not l, in format strings for 64-bit integers.
64-bit integers are *not* guaranteed to be longs and, in fact, are *not*
longs on ILP32 platforms such as 32-bit UN*Xes and 32-bit Windows and on
LLP64 platforms such as 64-bit Windows.
Change-Id: I6408778f638bb6cea52ffb64be39ea26c9b2ee64
Reviewed-on: https://code.wireshark.org/review/10213
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-cbor.c')
| -rw-r--r-- | epan/dissectors/packet-cbor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c index 40fccc1d40..91e8023493 100644 --- a/epan/dissectors/packet-cbor.c +++ b/epan/dissectors/packet-cbor.c @@ -413,7 +413,7 @@ dissect_cbor_array(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cbor_tree, gin tvb, orig_offset, -1, "Array", "(undefined elements)"); } else { item = proto_tree_add_string_format_value(cbor_tree, hf_cbor_type_array, - tvb, orig_offset, -1, "Array", "(%lu elements)", length); + tvb, orig_offset, -1, "Array", "(%"G_GINT64_MODIFIER"u elements)", length); } subtree = proto_item_add_subtree(item, ett_cbor_array); @@ -489,7 +489,7 @@ dissect_cbor_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cbor_tree, gint tvb, orig_offset, -1, "Map", "(undefined entries)"); } else { item = proto_tree_add_string_format_value(cbor_tree, hf_cbor_type_map, - tvb, orig_offset, -1, "Map", "(%lu entries)", length); + tvb, orig_offset, -1, "Map", "(%"G_GINT64_MODIFIER"u entries)", length); } subtree = proto_item_add_subtree(item, ett_cbor_map); |