From David Howells :

  Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).

The failures fall into two categories:
  (1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'.  This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
  (2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size.  Such values need to be cast to 'long
long' or 'unsigned long long'.

svn path=/trunk/; revision=21975

6 files changed, 18 insertions, 18 deletions

diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index c788687f9a..db746b8afa 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -1063,14 +1063,14 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 
 	proto_tree_add_text(tree, tvb, offset, new_offset - offset,
 	    "CLOCK_BIAS: (%llu)",
-	    temp_int);
+	    (unsigned long long) 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)",
-	    temp_int);
+	    (unsigned long long) temp_int);
 
 	offset = new_offset;
 	bit_mask = 0x80 >> (8 - bit_offset);
@@ -1148,14 +1148,14 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 
 	proto_tree_add_text(tree, tvb, offset, new_offset - offset,
 	    "HEIGHT: (%llu)",
-	    temp_int);
+	    (unsigned long long) 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)",
-	    temp_int);
+	    (unsigned long long) temp_int);
 
 	offset = new_offset;
 	bit_mask = 0x80 >> (8 - bit_offset);
@@ -1233,7 +1233,7 @@ for_pr_gps_sat_health(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset
 
 	    proto_tree_add_text(tree, tvb, offset, 1,
 		"BAD_SV_PRN_NUM: (%llu)",
-		temp_int);
+		(unsigned long long) temp_int);
 
 	    offset = new_offset;
 	}
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index b6b9abc0b0..a70874aeb5 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", start_time);
+            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);
 
             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", start_time);
+            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);
 
             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", start_time);
+            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);
 
             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", start_time);
+            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);
 
             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", start_time);
+            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);
 
             offset += 8;
             duration = tvb_get_letohs (tvb, offset);
diff --git a/epan/emem.c b/epan/emem.c
index 0e2994832b..3f34e8a2d5 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)node,(int)node->parent,(int)node->left,(int)node->right,node->key32,(int)node->data);
+	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);
 	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)emem_tree->tree);
+	printf("EMEM tree type:%d name:%s tree:0x%08x\n",emem_tree->type,emem_tree->name,(int)(long)emem_tree->tree);
 	if(emem_tree->tree)
 		emem_tree_print_nodes(emem_tree->tree, 0);
 }
diff --git a/epan/packet.c b/epan/packet.c
index 3d88e3a2e1..9dd465f860 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1757,7 +1757,7 @@ dissector_dump_decodes_display(const gchar *table_name,
     ftenum_t selector_type _U_, gpointer key, gpointer value,
     gpointer user_data _U_)
 {
-	guint32 selector = (guint32) key;
+	guint32 selector = (guint32)(unsigned long) key;
 	dissector_table_t sub_dissectors = find_dissector_table(table_name);
 	dtbl_entry_t *dtbl_entry;
 	dissector_handle_t handle;
diff --git a/epan/proto.c b/epan/proto.c
index 5c5ee49fd3..f435668f1e 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -510,7 +510,7 @@ static void
 free_GPtrArray_value(gpointer key _U_, gpointer value, gpointer user_data _U_)
 {
 	GPtrArray   *ptrs = value;
-	gint hfid = (gint)key;
+	gint hfid = (gint)(long)key;
 	header_field_info *hfinfo;
 
 
@@ -5770,13 +5770,13 @@ proto_tree_add_bits_ret_val(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint
 				return proto_tree_add_uint64_format(tree, hf_index, tvb, offset, length, value,
 				         "%s: %llu",
 						  str,
-						  value);
+						  (unsigned long long) value);
 				break;
 			case BASE_HEX:
 				return proto_tree_add_uint64_format(tree, hf_index, tvb, offset, length, value,
 			             "%s: 0x%llx",
 						  str,
-						  value);
+						  (unsigned long long) value);
 				break;
 			default:
 				DISSECTOR_ASSERT_NOT_REACHED();
diff --git a/epan/stream.c b/epan/stream.c
index bf264e1b83..434ed23fd1 100644
--- a/epan/stream.c
+++ b/epan/stream.c
@@ -106,7 +106,7 @@ guint stream_hash_func(gconstpointer k)
     const stream_key_t *key = (const stream_key_t *)k;
 
     /* is_circuit is redundant to the circuit/conversation pointer */
-    return ((guint)key->circ.circuit) ^ key->p2p_dir;
+    return ((guint)(unsigned long)key->circ.circuit) ^ key->p2p_dir;
 }
 
 /* compare func */
@@ -278,7 +278,7 @@ typedef struct fragment_key {
 guint fragment_hash_func(gconstpointer k)
 {
     const fragment_key_t *key = (const fragment_key_t *)k;
-    return ((guint)key->stream) + ((guint)key -> framenum) + ((guint)key->offset);
+    return ((guint)(unsigned long)key->stream) + ((guint)key -> framenum) + ((guint)key->offset);
 }
 
 /* compare func */