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-fcfzs.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-fcfzs.c')
-rw-r--r-- | epan/dissectors/packet-fcfzs.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 1a954dc5c9..bbf05b88a6 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -834,85 +834,85 @@ proto_register_fcfzs(void) static hf_register_info hf[] = { { &hf_fcfzs_opcode, {"Opcode", "fcfzs.opcode", FT_UINT16, BASE_HEX, - VALS (fc_fzs_opcode_val), 0x0, "", HFILL}}, + VALS (fc_fzs_opcode_val), 0x0, NULL, HFILL}}, { &hf_fcfzs_gzc_vendor, {"Vendor Specific Flags", "fcfzs.gzc.vendor", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_gest_vendor, {"Vendor Specific State", "fcfzs.gest.vendor", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_numzoneattrs, {"Number of Zone Attribute Entries", "fcfzs.zone.numattrs", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_zonesetnmlen, {"Zone Set Name Length", "fcfzs.zoneset.namelen", FT_UINT8, BASE_DEC, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_zonesetname, - {"Zone Set Name", "fcfzs.zoneset.name", FT_STRING, BASE_HEX, NULL, - 0x0, "", HFILL}}, + {"Zone Set Name", "fcfzs.zoneset.name", FT_STRING, BASE_NONE, NULL, + 0x0, NULL, HFILL}}, { &hf_fcfzs_numzones, {"Number of Zones", "fcfzs.zoneset.numzones", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_numzonesetattrs, {"Number of Zone Set Attribute Entries", "fcfzs.zoneset.numattrs", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_zonenmlen, {"Zone Name Length", "fcfzs.zone.namelen", FT_UINT8, BASE_DEC, NULL, - 0x0, "", HFILL}}, + 0x0, NULL, HFILL}}, { &hf_fcfzs_zonename, - {"Zone Name", "fcfzs.zone.name", FT_STRING, BASE_HEX, NULL, 0x0, "", + {"Zone Name", "fcfzs.zone.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_nummbrs, {"Number of Zone Members", "fcfzs.zone.nummbrs", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_nummbrentries, {"Number of Zone Member Attribute Entries", "fcfzs.zonembr.numattrs", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_mbrtype, {"Zone Member Identifier Type", "fcfzs.zonembr.idtype", FT_UINT8, - BASE_HEX, VALS (fc_fzs_zonembr_type_val), 0x0, "", HFILL}}, + BASE_HEX, VALS (fc_fzs_zonembr_type_val), 0x0, NULL, HFILL}}, { &hf_fcfzs_mbridlen, {"Zone Member Identifier Length", "fcfzs.zonembr.idlen", FT_UINT8, - BASE_DEC, NULL, 0x0, "", HFILL}}, + BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_mbrid, - {"Zone Member Identifier", "fcfzs.zone.mbrid", FT_STRING, BASE_HEX, - NULL, 0x0, "", HFILL}}, + {"Zone Member Identifier", "fcfzs.zone.mbrid", FT_STRING, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_reason, {"Reason Code", "fcfzs.reason", FT_UINT8, BASE_HEX, - VALS (fc_ct_rjt_code_vals), 0x0, "", HFILL}}, + VALS (fc_ct_rjt_code_vals), 0x0, NULL, HFILL}}, { &hf_fcfzs_rjtdetail, {"Reason Code Explanation", "fcfzs.rjtdetail", FT_UINT8, BASE_HEX, - VALS (fc_fzs_rjt_code_val), 0x0, "", HFILL}}, + VALS (fc_fzs_rjt_code_val), 0x0, NULL, HFILL}}, { &hf_fcfzs_rjtvendor, {"Vendor Specific Reason", "fcfzs.rjtvendor", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_maxres_size, {"Maximum/Residual Size", "fcfzs.maxres_size", FT_UINT16, BASE_DEC, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_mbrid_lun, - {"LUN", "fcfzs.zone.lun", FT_BYTES, BASE_HEX, NULL, 0x0, "", + {"LUN", "fcfzs.zone.lun", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcfzs_gzc_flags, {"Capabilities", "fcfzs.gzc.flags", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_fcfzs_gzc_flags_hard_zones, {"Hard Zones", "fcfzs.gzc.flags.hard_zones", FT_BOOLEAN, 8, - TFS(&tfs_fc_fcfzs_gzc_flags_hard_zones), 0x80, "", HFILL}}, + TFS(&tfs_fc_fcfzs_gzc_flags_hard_zones), 0x80, NULL, HFILL}}, { &hf_fcfzs_gzc_flags_soft_zones, {"Soft Zones", "fcfzs.gzc.flags.soft_zones", FT_BOOLEAN, 8, - TFS(&tfs_fc_fcfzs_gzc_flags_soft_zones), 0x40, "", HFILL}}, + TFS(&tfs_fc_fcfzs_gzc_flags_soft_zones), 0x40, NULL, HFILL}}, { &hf_fcfzs_gzc_flags_zoneset_db, {"ZoneSet Database", "fcfzs.gzc.flags.zoneset_db", FT_BOOLEAN, 8, - TFS(&tfs_fc_fcfzs_gzc_flags_zoneset_db), 0x01, "", HFILL}}, + TFS(&tfs_fc_fcfzs_gzc_flags_zoneset_db), 0x01, NULL, HFILL}}, { &hf_fcfzs_zone_state, {"Zone State", "fcfzs.zone.state", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_fcfzs_soft_zone_set_enforced, {"Soft Zone Set", "fcfzs.soft_zone_set.enforced", FT_BOOLEAN, 8, - TFS(&tfs_fc_fcfzs_soft_zone_set_enforced), 0x80, "", HFILL}}, + TFS(&tfs_fc_fcfzs_soft_zone_set_enforced), 0x80, NULL, HFILL}}, { &hf_fcfzs_hard_zone_set_enforced, {"Hard Zone Set", "fcfzs.hard_zone_set.enforced", FT_BOOLEAN, 8, - TFS(&tfs_fc_fcfzs_hard_zone_set_enforced), 0x40, "", HFILL}}, + TFS(&tfs_fc_fcfzs_hard_zone_set_enforced), 0x40, NULL, HFILL}}, }; /* Setup protocol subtree array */ |