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-fcfcs.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-fcfcs.c')
-rw-r--r-- | epan/dissectors/packet-fcfcs.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 5810a3aa34..52a7bff750 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -1022,97 +1022,97 @@ proto_register_fcfcs (void) static hf_register_info hf[] = { { &hf_fcs_opcode, {"Opcode", "fcs.opcode", FT_UINT16, BASE_HEX, - VALS (fc_fcs_opcode_val), 0x0, "", HFILL}}, + VALS (fc_fcs_opcode_val), 0x0, NULL, HFILL}}, { &hf_fcs_iename, - {"Interconnect Element Name", "fcs.ie.name", FT_STRING, BASE_HEX, - NULL, 0x0, "", HFILL}}, + {"Interconnect Element Name", "fcs.ie.name", FT_STRING, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_fcs_ietype, {"Interconnect Element Type", "fcs.ie.type", FT_UINT8, BASE_HEX, - VALS (fc_fcs_ietype_val), 0x0, "", HFILL}}, + VALS (fc_fcs_ietype_val), 0x0, NULL, HFILL}}, { &hf_fcs_iedomainid, {"Interconnect Element Domain ID", "fcs.ie.domainid", FT_UINT8, - BASE_HEX, NULL, 0x0, "", HFILL}}, + BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_mgmtid, {"Interconnect Element Mgmt. ID", "fcs.ie.mgmtid", FT_STRING, - BASE_HEX, NULL, 0x0, "", HFILL}}, + BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_fabricname, {"Interconnect Element Fabric Name", "fcs.ie.fname", FT_STRING, - BASE_HEX, NULL, 0x0, "", HFILL}}, + BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_mgmtaddr, {"Interconnect Element Mgmt. Address", "fcs.ie.mgmtaddr", FT_STRING, - BASE_HEX, NULL, 0x0, "", HFILL}}, + BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_lname, {"Interconnect Element Logical Name", "fcs.ie.logname", FT_STRING, - BASE_HEX, NULL, 0x0, "", HFILL}}, + BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_vendorname, - {"Vendor Name", "fcs.vendorname", FT_STRING, BASE_HEX, NULL, 0x0, "", + {"Vendor Name", "fcs.vendorname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_modelname, - {"Model Name/Number", "fcs.modelname", FT_STRING, BASE_HEX, NULL, - 0x0, "", HFILL}}, + {"Model Name/Number", "fcs.modelname", FT_STRING, BASE_NONE, NULL, + 0x0, NULL, HFILL}}, { &hf_fcs_portname, - {"Port Name", "fcs.port.name", FT_STRING, BASE_HEX, NULL, 0x0, "", + {"Port Name", "fcs.port.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_portmodtype, {"Port Module Type", "fcs.port.moduletype", FT_UINT8, BASE_HEX, - VALS (fc_fcs_port_modtype_val), 0x0, "", HFILL}}, + VALS (fc_fcs_port_modtype_val), 0x0, NULL, HFILL}}, { &hf_fcs_porttxtype, {"Port TX Type", "fcs.port.txtype", FT_UINT8, BASE_HEX, - VALS (fc_fcs_port_txtype_val), 0x0, "", HFILL}}, + VALS (fc_fcs_port_txtype_val), 0x0, NULL, HFILL}}, { &hf_fcs_porttype, {"Port Type", "fcs.port.type", FT_UINT8, BASE_HEX, - VALS (fc_fcs_port_type_val), 0x0, "", HFILL}}, + VALS (fc_fcs_port_type_val), 0x0, NULL, HFILL}}, { &hf_fcs_physportnum, - {"Physical Port Number", "fcs.port.physportnum", FT_BYTES, BASE_HEX, - NULL, 0x0, "", HFILL}}, + {"Physical Port Number", "fcs.port.physportnum", FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_fcs_portflags, {"Port Flags", "fcs.port.flags", FT_BOOLEAN, BASE_NONE, - TFS (&fc_fcs_portflags_tfs), 0x0, "", HFILL}}, + TFS (&fc_fcs_portflags_tfs), 0x0, NULL, HFILL}}, { &hf_fcs_portstate, {"Port State", "fcs.port.state", FT_UINT8, BASE_HEX, - VALS (fc_fcs_port_state_val), 0x0, "", HFILL}}, + VALS (fc_fcs_port_state_val), 0x0, NULL, HFILL}}, { &hf_fcs_platformname, - {"Platform Name", "fcs.platform.name", FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL}}, + {"Platform Name", "fcs.platform.name", FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL}}, { &hf_fcs_platformnname, - {"Platform Node Name", "fcs.platform.nodename", FT_STRING, BASE_HEX, - NULL, 0x0, "", HFILL}}, + {"Platform Node Name", "fcs.platform.nodename", FT_STRING, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_fcs_platformtype, {"Platform Type", "fcs.platform.type", FT_UINT8, BASE_HEX, - VALS (fc_fcs_plat_type_val), 0x0, "", HFILL}}, + VALS (fc_fcs_plat_type_val), 0x0, NULL, HFILL}}, { &hf_fcs_platformaddr, - {"Management Address", "fcs.platform.mgmtaddr", FT_STRING, BASE_HEX, - NULL, 0x0, "", HFILL}}, + {"Management Address", "fcs.platform.mgmtaddr", FT_STRING, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_fcs_reason, {"Reason Code", "fcs.reason", FT_UINT8, BASE_HEX, - VALS (fc_ct_rjt_code_vals), 0x0, "", HFILL}}, + VALS (fc_ct_rjt_code_vals), 0x0, NULL, HFILL}}, { &hf_fcs_rjtdetail, {"Reason Code Explanantion", "fcs.reasondet", FT_UINT8, BASE_HEX, - VALS (fc_fcs_rjt_code_val), 0x0, "", HFILL}}, + VALS (fc_fcs_rjt_code_val), 0x0, NULL, HFILL}}, { &hf_fcs_vendor, {"Vendor Unique Reject Code", "fcs.err.vendor", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcs_numcap, {"Number of Capabilities", "fcs.numcap", FT_UINT32, BASE_DEC, NULL, - 0x0, "", HFILL}}, + 0x0, NULL, HFILL}}, { &hf_fcs_mgmt_subtype, {"Management GS Subtype", "fcs.gssubtype", FT_UINT8, BASE_HEX, NULL, - 0x0, "", HFILL}}, + 0x0, NULL, HFILL}}, { &hf_fcs_vnd_capmask, {"Vendor Unique Capability Bitmask", "fcs.vbitmask", FT_UINT24, - BASE_HEX, NULL, 0x0, "", HFILL}}, + BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_fcs_fcsmask, {"Subtype Capability Bitmask", "fcs.fcsmask", FT_UINT32, BASE_HEX, - VALS (fc_fcs_fcsmask_val), 0x0, "", HFILL}}, + VALS (fc_fcs_fcsmask_val), 0x0, NULL, HFILL}}, { &hf_fcs_unsmask, {"Subtype Capability Bitmask", "fcs.unsmask", FT_UINT32, BASE_HEX, - VALS (fc_fcs_unsmask_val), 0x0, "", HFILL}}, + VALS (fc_fcs_unsmask_val), 0x0, NULL, HFILL}}, { &hf_fcs_maxres_size, {"Maximum/Residual Size", "fcs.maxres_size", FT_UINT16, BASE_DEC, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcs_releasecode, - {"Release Code", "fcs.releasecode", FT_STRING, BASE_HEX, NULL, 0x0, - "", HFILL}}, + {"Release Code", "fcs.releasecode", FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL}}, }; /* Setup protocol subtree array */ |