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-aarp.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-aarp.c')
| -rw-r--r-- | epan/dissectors/packet-aarp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index 5162de4448..0ea0451e32 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.c @@ -275,67 +275,67 @@ proto_register_aarp(void) { &hf_aarp_hard_type, { "Hardware type", "aarp.hard.type", FT_UINT16, BASE_HEX, VALS(hrd_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_proto_type, { "Protocol type", "aarp.proto.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_hard_size, { "Hardware size", "aarp.hard.size", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_proto_size, { "Protocol size", "aarp.proto.size", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_opcode, { "Opcode", "aarp.opcode", FT_UINT16, BASE_DEC, VALS(op_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_src_hw, { "Sender hardware address", "aarp.src.hw", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_src_hw_mac, { "Sender MAC address", "aarp.src.hw_mac", FT_ETHER, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_src_proto, { "Sender protocol address", "aarp.src.proto", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_src_proto_id, { "Sender ID", "aarp.src.proto_id", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, { &hf_aarp_dst_hw, { "Target hardware address", "aarp.dst.hw", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_dst_hw_mac, { "Target MAC address", "aarp.dst.hw_mac", FT_ETHER, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_dst_proto, { "Target protocol address", "aarp.dst.proto", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_aarp_dst_proto_id, { "Target ID", "aarp.dst.proto_id", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, }; static gint *ett[] = { &ett_aarp, |