Check for G_GINT64_MODIFIER in Wireshark as we do in Wiretap.

In all the places where a cast to "long long" or "unsigned long long"
was done, use G_GINT64_MODIFIER and get rid of the cast, as

	1) there's no guarantee that "%ll" works

and

	2) there's no guarantee that "long long" works

(the latter definitely does *NOT* work with MSVC++; the former doesn't
work with regular printf in MSVC++, but it might work with the GLib
printf-based functions).

svn path=/trunk/; revision=21978

4 files changed, 17 insertions, 24 deletions

diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index db746b8afa..dac6e2a760 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -1062,15 +1062,13 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 	temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 18);
 
 	proto_tree_add_text(tree, tvb, offset, new_offset - offset,
-	    "CLOCK_BIAS: (%llu)",
-	    (unsigned long long) temp_int);
+	    "CLOCK_BIAS: (%" G_GINT64_MODIFIER "u)", temp_int);
 
 	offset = new_offset;
 	temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 16);
 
 	proto_tree_add_text(tree, tvb, offset, new_offset - offset,
-	    "CLOCK_DRIFT: (%llu)",
-	    (unsigned long long) temp_int);
+	    "CLOCK_DRIFT: (%" G_GINT64_MODIFIER "u)", temp_int);
 
 	offset = new_offset;
 	bit_mask = 0x80 >> (8 - bit_offset);
@@ -1147,15 +1145,13 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 	temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 14);
 
 	proto_tree_add_text(tree, tvb, offset, new_offset - offset,
-	    "HEIGHT: (%llu)",
-	    (unsigned long long) temp_int);
+	    "HEIGHT: (%" G_GINT64_MODIFIER "u)", temp_int);
 
 	offset = new_offset;
 	temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 5);
 
 	proto_tree_add_text(tree, tvb, offset, new_offset - offset,
-	    "LOC_UNCRTNTY_V: (%llu)",
-	    (unsigned long long) temp_int);
+	    "LOC_UNCRTNTY_V: (%" G_GINT64_MODIFIER "u)", temp_int);
 
 	offset = new_offset;
 	bit_mask = 0x80 >> (8 - bit_offset);
@@ -1232,8 +1228,7 @@ for_pr_gps_sat_health(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset
 	    temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 5);
 
 	    proto_tree_add_text(tree, tvb, offset, 1,
-		"BAD_SV_PRN_NUM: (%llu)",
-		(unsigned long long) temp_int);
+		"BAD_SV_PRN_NUM: (%" G_GINT64_MODIFIER "u)", temp_int);
 
 	    offset = new_offset;
 	}
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index a70874aeb5..6f405191b9 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -4525,7 +4525,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
             proto_tree_add_uint_format(sub_tree, hf_tag_measure_request_channel_number, tvb, offset, 1, channel_number, "Measurement Channel Number: 0x%02X", channel_number);
 
             start_time = tvb_get_letoh64 (tvb, offset);
-            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_request_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016llX", (unsigned long long) start_time);
+            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_request_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
 
             offset += 8;
             duration = tvb_get_letohs (tvb, offset);
@@ -4737,7 +4737,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
 
             offset++;
             start_time = tvb_get_letoh64 (tvb, offset);
-            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016llX", (unsigned long long) start_time);
+            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
 
             offset += 8;
             duration = tvb_get_letohs (tvb, offset);
@@ -4753,7 +4753,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
 
             offset++;
             start_time = tvb_get_letoh64 (tvb, offset);
-            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016llX", (unsigned long long) start_time);
+            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
 
             offset += 8;
             duration = tvb_get_letohs (tvb, offset);
@@ -4793,7 +4793,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
 
             offset++;
             start_time = tvb_get_letoh64 (tvb, offset);
-            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016llX", (unsigned long long) start_time);
+            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
 
             offset += 8;
             duration = tvb_get_letohs (tvb, offset);
@@ -4824,7 +4824,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of
 
             offset++;
             start_time = tvb_get_letoh64 (tvb, offset);
-            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016llX", (unsigned long long) start_time);
+            proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "X", start_time);
 
             offset += 8;
             duration = tvb_get_letohs (tvb, offset);
diff --git a/epan/emem.c b/epan/emem.c
index 3f34e8a2d5..430ff4e1b6 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -1536,7 +1536,7 @@ emem_tree_print_nodes(emem_tree_node_t* node, int level)
 		printf("    ");
 	}
 
-	printf("NODE:%08x parent:%08x left:0x%08x right:%08x key:%d data:0x%08x\n",(int)(long)node,(int)(long)node->parent,(int)(long)node->left,(int)(long)node->right,node->key32,(int)(long)node->data);
+	printf("NODE:%p parent:%p left:0x%p right:%px key:%d data:%p\n",node,node->parent,node->left,node->right,node->key32,node->data);
 	if(node->left)
 		emem_tree_print_nodes(node->left, level+1);
 	if(node->right)
@@ -1548,7 +1548,7 @@ emem_print_tree(emem_tree_t* emem_tree)
 	if (!emem_tree)
 		return;
 
-	printf("EMEM tree type:%d name:%s tree:0x%08x\n",emem_tree->type,emem_tree->name,(int)(long)emem_tree->tree);
+	printf("EMEM tree type:%d name:%s tree:%p\n",emem_tree->type,emem_tree->name,emem_tree->tree);
 	if(emem_tree->tree)
 		emem_tree_print_nodes(emem_tree->tree, 0);
 }
diff --git a/epan/proto.c b/epan/proto.c
index f435668f1e..ab5ce4952d 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -507,7 +507,7 @@ proto_tree_free(proto_tree *tree)
 }
 
 static void
-free_GPtrArray_value(gpointer key _U_, gpointer value, gpointer user_data _U_)
+free_GPtrArray_value(gpointer key, gpointer value, gpointer user_data _U_)
 {
 	GPtrArray   *ptrs = value;
 	gint hfid = (gint)(long)key;
@@ -5768,15 +5768,13 @@ proto_tree_add_bits_ret_val(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint
 		switch(hf_field->display){
 			case BASE_DEC:
 				return proto_tree_add_uint64_format(tree, hf_index, tvb, offset, length, value,
-				         "%s: %llu",
-						  str,
-						  (unsigned long long) value);
+				         "%s: %" G_GINT64_MODIFIER "u",
+						  str, value);
 				break;
 			case BASE_HEX:
 				return proto_tree_add_uint64_format(tree, hf_index, tvb, offset, length, value,
-			             "%s: 0x%llx",
-						  str,
-						  (unsigned long long) value);
+			             "%s: 0x%" G_GINT64_MODIFIER "x",
+						  str, value);
 				break;
 			default:
 				DISSECTOR_ASSERT_NOT_REACHED();