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-oicq.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-oicq.c')
| -rw-r--r-- | epan/dissectors/packet-oicq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index e94a827b2e..96a87ade1c 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -179,16 +179,16 @@ proto_register_oicq(void) NULL, 0, "Version-zz", HFILL }}, { &hf_oicq_command, { "Command", "oicq.command", FT_UINT16, BASE_DEC, - VALS(oicq_command_vals), 0, "Command", HFILL }}, + VALS(oicq_command_vals), 0, NULL, HFILL }}, { &hf_oicq_seq, { "Sequence", "oicq.seq", FT_UINT16, BASE_DEC, - NULL, 0, "Sequence", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_oicq_qqid, { "Data(OICQ Number,if sender is client)", "oicq.qqid", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_oicq_data, { - "Data", "oicq.data", FT_STRING, 0, - NULL, 0, "Data", HFILL }}, + "Data", "oicq.data", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, }; static gint *ett[] = { &ett_oicq, |