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-yhoo.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-yhoo.c')
| -rw-r--r-- | epan/dissectors/packet-yhoo.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c index 16ab6bbfdb..11468b3e21 100644 --- a/epan/dissectors/packet-yhoo.c +++ b/epan/dissectors/packet-yhoo.c @@ -265,33 +265,33 @@ proto_register_yhoo(void) static hf_register_info hf[] = { { &hf_yhoo_service, { "Service Type", "yhoo.service", FT_UINT32, BASE_DEC, - VALS(yhoo_service_vals), 0, "Service Type", HFILL }}, + VALS(yhoo_service_vals), 0, NULL, HFILL }}, { &hf_yhoo_msgtype, { "Message Type", "yhoo.msgtype", FT_UINT32, BASE_DEC, VALS(yhoo_msgtype_vals), 0, "Message Type Flags", HFILL }}, { &hf_yhoo_connection_id, { "Connection ID", "yhoo.connection_id", FT_UINT32, BASE_HEX, - NULL, 0, "Connection ID", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_yhoo_magic_id, { "Magic ID", "yhoo.magic_id", FT_UINT32, BASE_HEX, - NULL, 0, "Magic ID", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_yhoo_unknown1, { "Unknown 1", "yhoo.unknown1", FT_UINT32, BASE_HEX, - NULL, 0, "Unknown 1", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_yhoo_len, { "Packet Length", "yhoo.len", FT_UINT32, BASE_DEC, - NULL, 0, "Packet Length", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_yhoo_nick1, { - "Real Nick (nick1)", "yhoo.nick1", FT_STRING, 0, - NULL, 0, "Real Nick (nick1)", HFILL }}, + "Real Nick (nick1)", "yhoo.nick1", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, { &hf_yhoo_nick2, { - "Active Nick (nick2)", "yhoo.nick2", FT_STRING, 0, - NULL, 0, "Active Nick (nick2)", HFILL }}, + "Active Nick (nick2)", "yhoo.nick2", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, { &hf_yhoo_content, { - "Content", "yhoo.content", FT_STRING, 0, + "Content", "yhoo.content", FT_STRING, BASE_NONE, NULL, 0, "Data portion of the packet", HFILL }}, { &hf_yhoo_version, { - "Version", "yhoo.version", FT_STRING, 0, + "Version", "yhoo.version", FT_STRING, BASE_NONE, NULL, 0, "Packet version identifier", HFILL }}, }; static gint *ett[] = { |