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-pim.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-pim.c') diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 005f751042..ccb6b5a582 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -1233,16 +1233,16 @@ proto_register_pim(void) static hf_register_info hf[] = { { &hf_pim_version, { "Version", "pim.version", - FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pim_type, { "Type", "pim.type", - FT_UINT8, BASE_DEC, VALS(type2vals), 0x0, "", HFILL }}, + FT_UINT8, BASE_DEC, VALS(type2vals), 0x0, NULL, HFILL }}, { &hf_pim_code, { "Code", "pim.code", - FT_UINT8, BASE_DEC, VALS(type1vals), 0x0, "", HFILL }}, + FT_UINT8, BASE_DEC, VALS(type1vals), 0x0, NULL, HFILL }}, { &hf_pim_cksum, { "Checksum", "pim.cksum", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, }; static gint *ett[] = { &ett_pim, -- cgit v1.2.3