From 8fd3ee05600dd7d0e6434e7eb824932c52000ce3 Mon Sep 17 00:00:00 2001 From: Stephen Fisher Date: Wed, 28 Mar 2007 21:55:11 +0000 Subject: Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253 --- epan/dissectors/packet-fcswils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-fcswils.c') diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index fcea72acab..90b2be19b7 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -1260,7 +1260,7 @@ dissect_swils_zone_mbr (tvbuff_t *tvb, proto_tree *zmbr_tree, int offset) 3))); break; case FC_SWILS_ZONEMBR_ALIAS: - str = (char*)zonenm_to_str (tvb, offset+4); + str = zonenm_to_str (tvb, offset+4); proto_tree_add_string (zmbr_tree, hf_swils_zone_mbrid, tvb, offset+4, idlen, str); break; @@ -1311,7 +1311,7 @@ dissect_swils_zone_obj (tvbuff_t *tvb, proto_tree *zobj_tree, int offset) 1, 0); proto_tree_add_item (zobj_tree, hf_swils_zone_protocol, tvb, offset+1, 1, 0); - str = (char*)zonenm_to_str (tvb, offset+4); + str = zonenm_to_str (tvb, offset+4); proto_tree_add_string (zobj_tree, hf_swils_zone_objname, tvb, offset+4, ZONENAME_LEN (tvb, offset+4), str); @@ -1356,7 +1356,7 @@ dissect_swils_mergereq (tvbuff_t *tvb, proto_tree *mr_tree, guint8 isreq) "Active ZoneSet Length: %u", zonesetlen); if (zonesetlen) { - str = (char*)zonenm_to_str (tvb, offset+4); + str = zonenm_to_str (tvb, offset+4); proto_tree_add_string (mr_tree, hf_swils_zone_activezonenm, tvb, offset+4, ZONENAME_LEN (tvb, offset+4), str); @@ -1503,7 +1503,7 @@ dissect_swils_sfc (tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq) "ZoneSet Length: %d", zonesetlen); if (zonesetlen) { - str = (char*)zonenm_to_str (tvb, offset+4); + str = zonenm_to_str (tvb, offset+4); proto_tree_add_string (sfc_tree, hf_swils_sfc_zonenm, tvb, offset+4, ZONENAME_LEN (tvb, offset+4), str); -- cgit v1.2.3