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-fcct.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-fcct.c')
| -rw-r--r-- | epan/dissectors/packet-fcct.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index a37251bad5..3c60730ad6 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -243,37 +243,37 @@ proto_register_fcct(void) /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_fcct_revision, - {"Revision", "fcct.revision", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, + {"Revision", "fcct.revision", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_fcct_inid, - {"IN_ID", "fcct.in_id", FT_STRING, BASE_HEX, NULL, 0x0, "", HFILL}}, + {"IN_ID", "fcct.in_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcct_gstype, {"GS Type", "fcct.gstype", FT_UINT8, BASE_HEX, VALS(fc_ct_gstype_vals), - 0x0, "", HFILL}}, + 0x0, NULL, HFILL}}, { &hf_fcct_gssubtype, {"GS Subtype", "fcct.gssubtype", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_fcct_server, {"Server", "fcct.server", FT_UINT8, BASE_HEX, VALS (fc_ct_gsserver_vals), 0x0, "Derived from GS Type & Subtype fields", HFILL}}, { &hf_fcct_options, - {"Options", "fcct.options", FT_UINT8, BASE_HEX, NULL, 0x0, "", + {"Options", "fcct.options", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_fcct_ext_said, - {"Auth SAID", "fcct.ext_said", FT_UINT32, BASE_HEX, NULL, 0x0, "", + {"Auth SAID", "fcct.ext_said", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_fcct_ext_tid, - {"Transaction ID", "fcct.ext_tid", FT_UINT32, BASE_HEX, NULL, 0x0, "", + {"Transaction ID", "fcct.ext_tid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_fcct_ext_reqname, - {"Requestor Port Name", "fcct.ext_reqnm", FT_BYTES, BASE_HEX, NULL, - 0x0, "", HFILL}}, + {"Requestor Port Name", "fcct.ext_reqnm", FT_BYTES, BASE_NONE, NULL, + 0x0, NULL, HFILL}}, { &hf_fcct_ext_tstamp, - {"Timestamp", "fcct.ext_tstamp", FT_BYTES, BASE_HEX, NULL, 0x0, "", + {"Timestamp", "fcct.ext_tstamp", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcct_ext_authblk, - {"Auth Hash Blk", "fcct.ext_authblk", FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL}}, + {"Auth Hash Blk", "fcct.ext_authblk", FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL}}, }; /* Setup protocol subtree array */ |