aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-arp.c
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2007-12-20 17:34:39 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2007-12-20 17:34:39 +0000
commit63263e07596c9e36280ad674bfe0d6f3068b5f06 (patch)
tree46ee4d0d08d739f300c723bf58b41a2bf166d5dc /epan/dissectors/packet-arp.c
parent5e06b1b046130d753be02204752d568547ab3b73 (diff)
Fix some casts.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23930 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-arp.c')
-rw-r--r--epan/dissectors/packet-arp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index a74f08a510..d42e9e325c 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -408,13 +408,13 @@ dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree)
/* l.s. 32 bits are ipv4 address */
static guint address_hash_func(gconstpointer v)
{
- return (guint)(guint32)v;
+ return GPOINTER_TO_UINT(v);
}
/* Compare 2 ipv4 addresses */
static gint address_equal_func(gconstpointer v, gconstpointer v2)
{
- return (guint32)v == (guint32)v2;
+ return v == v2;
}
/* Check to see if this mac & ip pair represent 2 devices trying to share
@@ -426,7 +426,7 @@ static void check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
struct address_hash_value *value;
/* Look up any existing entries */
- value = g_hash_table_lookup(address_hash_table, (gconstpointer)ip);
+ value = g_hash_table_lookup(address_hash_table, GUINT_TO_POINTER(ip));
/* If MAC matches table, just update details */
if (value != NULL)
@@ -482,7 +482,7 @@ static void check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
value->time_of_entry = pinfo->fd->abs_ts.secs;
/* Add it */
- g_hash_table_insert(address_hash_table, (void*)ip, value);
+ g_hash_table_insert(address_hash_table, GUINT_TO_POINTER(ip), value);
}
}