From b228488bc0b9d5e0c63b15814836f7332f35ce04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Thu, 18 Jun 2009 21:30:42 +0000 Subject: From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770 --- epan/dissectors/packet-gmrp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-gmrp.c') diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 458d10aef6..6d53d96065 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -347,32 +347,32 @@ proto_register_gmrp(void) { &hf_gmrp_proto_id, { "Protocol ID", "gmrp.protocol_id", FT_UINT16, BASE_HEX, NULL, 0x0, - "" , HFILL } + NULL , HFILL } }, { &hf_gmrp_attribute_type, { "Type", "gmrp.attribute_type", FT_UINT8, BASE_HEX, VALS(attribute_type_vals), 0x0, - "" , HFILL } + NULL , HFILL } }, { &hf_gmrp_attribute_length, { "Length", "gmrp.attribute_length", FT_UINT8, BASE_DEC, NULL, 0x0, - "" , HFILL } + NULL , HFILL } }, { &hf_gmrp_attribute_event, { "Event", "gmrp.attribute_event", FT_UINT8, BASE_DEC, VALS(event_vals), 0x0, - "" , HFILL } + NULL , HFILL } }, { &hf_gmrp_attribute_value_group_membership, { "Value", "gmrp.attribute_value_group_membership", FT_ETHER, BASE_HEX, NULL, 0x0, - "" , HFILL } + NULL , HFILL } }, { &hf_gmrp_attribute_value_service_requirement, { "Value", "gmrp.attribute_value_service_requirement", FT_UINT8, BASE_HEX, NULL, 0x0, - "" , HFILL } + NULL , HFILL } } }; -- cgit v1.2.3