diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-fw1.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) |
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
Diffstat (limited to 'epan/dissectors/packet-fw1.c')
-rw-r--r-- | epan/dissectors/packet-fw1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index c74ac146d7..b54d9c8ee3 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -231,20 +231,20 @@ proto_register_fw1(void) static hf_register_info hf[] = { { &hf_fw1_direction, { "Direction", "fw1.direction", FT_STRING, BASE_NONE, NULL, 0x0, - "Direction", HFILL }}, + NULL, HFILL }}, { &hf_fw1_chain, { "Chain Position", "fw1.chain", FT_STRING, BASE_NONE, NULL, 0x0, - "Chain Position", HFILL }}, + NULL, HFILL }}, { &hf_fw1_interface, { "Interface", "fw1.interface", FT_STRING, BASE_NONE, NULL, 0x0, - "Interface", HFILL }}, + NULL, HFILL }}, { &hf_fw1_uuid, { "UUID", "fw1.uuid", FT_UINT32, BASE_DEC, NULL, 0x0, - "UUID", HFILL }}, + NULL, HFILL }}, /* registered here but handled in ethertype.c */ { &hf_fw1_type, { "Type", "fw1.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, }; /* Setup protocol subtree array */ static gint *ett[] = { |