diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-12-03 02:07:07 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-12-03 02:07:07 +0000 |
| commit | cba17709a8f9a7489270a1001772724ea0bbf698 (patch) | |
| tree | ac9170e7240cd848ee64ad3b0359f15dcb5114db | |
| parent | 404ac984f539cda172c4af764d071b42656f52b0 (diff) | |
Cast const pointer arguments to "g_free()" and "g_hash_table_foreach()"
to "gpointer", so that we only get warnings when we turn on the extra
GCC warning checks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6734 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | conditions.c | 4 | ||||
| -rw-r--r-- | packet-nlm.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/conditions.c b/conditions.c index 74f08b49a8..285dd697c8 100644 --- a/conditions.c +++ b/conditions.c @@ -1,7 +1,7 @@ /* conditions.c * Implementation for condition handler. * - * $Id: conditions.c,v 1.4 2002/12/02 23:43:25 guy Exp $ + * $Id: conditions.c,v 1.5 2002/12/03 02:07:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -168,7 +168,7 @@ void cnd_unregister_class(const char* class_id){ /* find the key for this class id and store it in 'pkey' */ g_hash_table_foreach(classes, _cnd_find_hash_key_for_class_id, - key); + (gpointer)key); /* find the class structure for this class id */ cls = (_cnd_class*)g_hash_table_lookup(classes, class_id); /* remove constructor from hash table */ diff --git a/packet-nlm.c b/packet-nlm.c index 7f52dce1b7..7a28cd1482 100644 --- a/packet-nlm.c +++ b/packet-nlm.c @@ -1,7 +1,7 @@ /* packet-nlm.c * Routines for nlm dissection * - * $Id: packet-nlm.c,v 1.32 2002/12/02 23:43:28 guy Exp $ + * $Id: packet-nlm.c,v 1.33 2002/12/03 02:07:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -122,7 +122,7 @@ nlm_msg_res_unmatched_free_all(gpointer key_arg _U_, gpointer value, gpointer us { nlm_msg_res_unmatched_data *umd = (nlm_msg_res_unmatched_data *)value; - g_free(umd->cookie); + g_free((gpointer)umd->cookie); g_free(umd); return TRUE; @@ -286,7 +286,7 @@ nlm_register_unmatched_res(packet_info *pinfo, tvbuff_t *tvb, int offset) g_hash_table_insert(nlm_msg_res_matched, (gpointer)md->rep_frame, (gpointer)md); g_hash_table_remove(nlm_msg_res_unmatched, (gconstpointer)old_umd); - g_free(old_umd->cookie); + g_free((gpointer)old_umd->cookie); g_free(old_umd); } } @@ -312,7 +312,7 @@ nlm_register_unmatched_msg(packet_info *pinfo, tvbuff_t *tvb, int offset) old_umd=g_hash_table_lookup(nlm_msg_res_unmatched, (gconstpointer)umd); if(old_umd){ g_hash_table_remove(nlm_msg_res_unmatched, (gconstpointer)old_umd); - g_free(old_umd->cookie); + g_free((gpointer)old_umd->cookie); g_free(old_umd); } |