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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 166 insertions, 166 deletions

diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index ba961bff8b..7be14ad47f 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -4995,184 +4995,184 @@ proto_register_scsi (void)
         volume set addressing hosts*/
         { &hf_scsi_lun,
           {"LUN", "scsi.lun", FT_UINT16, BASE_HEX,
-           NULL, 0x0, "LUN", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_status,
           { "Status", "scsi.status", FT_UINT8, BASE_HEX,
            VALS(scsi_status_val), 0, "SCSI command status value", HFILL }},
         { &hf_scsi_spcopcode,
           {"SPC-2 Opcode", "scsi.spc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_spc_vals), 0x0, "", HFILL}},
+           VALS (scsi_spc_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_control,
-          {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_inquiry_flags,
-          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_inquiry_evpd_page,
           {"EVPD Page Code", "scsi.inquiry.evpd.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_evpd_pagecode_val), 0x0, "", HFILL}},
+           VALS (scsi_evpd_pagecode_val), 0x0, NULL, HFILL}},
         { &hf_scsi_inquiry_cmdt_page,
           {"CMDT Page Code", "scsi.inquiry.cmdt.pagecode", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_alloclen,
           {"Allocation Length", "scsi.cdb.alloclen", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_paramlen,
           {"Parameter Length", "scsi.cdb.paramlen", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_log_pc,
           {"Page Control", "scsi.log.pc", FT_UINT8, BASE_DEC,
-           VALS (scsi_log_pc_val), 0xC0, "", HFILL}},
+           VALS (scsi_log_pc_val), 0xC0, NULL, HFILL}},
         { &hf_scsi_log_pagecode,
           {"Page Code", "scsi.log.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_log_page_val), 0x3F, "", HFILL}},
+           VALS (scsi_log_page_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_paramlen16,
           {"Parameter Length", "scsi.cdb.paramlen16", FT_UINT16, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_modesel_flags,
           {"Mode Sense/Select Flags", "scsi.cdb.mode.flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_alloclen16,
           {"Allocation Length", "scsi.cdb.alloclen16", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_modesns_pc,
           {"Page Control", "scsi.mode.pc", FT_UINT8, BASE_DEC,
-           VALS (scsi_modesns_pc_val), 0xC0, "", HFILL}},
+           VALS (scsi_modesns_pc_val), 0xC0, NULL, HFILL}},
         { &hf_scsi_spcpagecode,
           {"SPC-2 Page Code", "scsi.mode.spc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_spc_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_spc_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_sbcpagecode,
           {"SBC-2 Page Code", "scsi.mode.sbc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_sbc_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_sbc_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_sscpagecode,
           {"SSC-2 Page Code", "scsi.mode.ssc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_ssc2_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_ssc2_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_mmcpagecode,
           {"MMC-5 Page Code", "scsi.mode.mmc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_mmc5_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_mmc5_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_smcpagecode,
           {"SMC-2 Page Code", "scsi.mode.smc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_smc_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_smc_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_modesns_flags,
-          {"Flags", "scsi.mode.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.mode.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_persresvin_svcaction,
           {"Service Action", "scsi.persresvin.svcaction", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresvin_svcaction_val), 0x0F, "", HFILL}},
+           VALS (scsi_persresvin_svcaction_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_persresvout_svcaction,
           {"Service Action", "scsi.persresvout.svcaction", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresvout_svcaction_val), 0x0F, "", HFILL}},
+           VALS (scsi_persresvout_svcaction_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_persresv_scope,
           {"Reservation Scope", "scsi.persresv.scope", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresv_scope_val), 0xF0, "", HFILL}},
+           VALS (scsi_persresv_scope_val), 0xF0, NULL, HFILL}},
         { &hf_scsi_persresv_type,
           {"Reservation Type", "scsi.persresv.type", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresv_type_val), 0x0F, "", HFILL}},
+           VALS (scsi_persresv_type_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_release_flags,
           {"Release Flags", "scsi.release.flags", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_release_thirdpartyid,
-          {"Third-Party ID", "scsi.release.thirdpartyid", FT_BYTES, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Third-Party ID", "scsi.release.thirdpartyid", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_alloclen32,
           {"Allocation Length", "scsi.cdb.alloclen32", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_inq_add_len,
           {"Additional Length", "scsi.inquiry.add_len", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_qualifier,
           {"Qualifier", "scsi.inquiry.qualifier", FT_UINT8, BASE_HEX,
-           VALS (scsi_qualifier_val), 0xE0, "", HFILL}},
+           VALS (scsi_qualifier_val), 0xE0, NULL, HFILL}},
         { &hf_scsi_inq_peripheral,
           {"Peripheral", "scsi.inquiry.peripheral", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_vendor_id,
           {"Vendor Id", "scsi.inquiry.vendor_id", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_product_id,
           {"Product Id", "scsi.inquiry.product_id", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_product_rev,
           {"Product Revision Level", "scsi.inquiry.product_rev", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_vendor_specific,
           {"Vendor Specific", "scsi.inquiry.vendor_specific", FT_BYTES, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_reserved,
           {"Reserved", "scsi.inquiry.reserved", FT_BYTES, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_version_desc,
           {"Version Description", "scsi.inquiry.version_desc", FT_UINT16, BASE_HEX,
-           VALS(scsi_verdesc_val), 0, "", HFILL}},
+           VALS(scsi_verdesc_val), 0, NULL, HFILL}},
         { &hf_scsi_inq_devtype,
           {"Device Type", "scsi.inquiry.devtype", FT_UINT8, BASE_HEX,
-           VALS (scsi_devtype_val), SCSI_DEV_BITS, "", HFILL}},
+           VALS (scsi_devtype_val), SCSI_DEV_BITS, NULL, HFILL}},
         { &hf_scsi_inq_rmb,
           {"Removable", "scsi.inquiry.removable", FT_BOOLEAN, 8,
-           TFS (&scsi_removable_val), 0x80, "", HFILL}},
+           TFS (&scsi_removable_val), 0x80, NULL, HFILL}},
         { & hf_scsi_inq_version,
           {"Version", "scsi.inquiry.version", FT_UINT8, BASE_HEX,
-           VALS (scsi_inquiry_vers_val), 0x0, "", HFILL}},
+           VALS (scsi_inquiry_vers_val), 0x0, NULL, HFILL}},
         { &hf_scsi_inq_reladrflags,
           {"Flags", "scsi.inquiry.reladrflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_reladr,
           {"RelAdr", "scsi.inquiry.reladr", FT_BOOLEAN, 8, TFS(&reladr_tfs), SCSI_INQ_RELADRFLAGS_RELADR,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_sync,
           {"Sync", "scsi.inquiry.sync", FT_BOOLEAN, 8, TFS(&sync_tfs), SCSI_INQ_RELADRFLAGS_SYNC,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_linked,
           {"Linked", "scsi.inquiry.linked", FT_BOOLEAN, 8, TFS(&linked_tfs), SCSI_INQ_RELADRFLAGS_LINKED,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_cmdque,
           {"CmdQue", "scsi.inquiry.cmdque", FT_BOOLEAN, 8, TFS(&cmdque_tfs), SCSI_INQ_RELADRFLAGS_CMDQUE,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_bqueflags,
           {"Flags", "scsi.inquiry.bqueflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_bque,
           {"BQue", "scsi.inquiry.bque", FT_BOOLEAN, 8, TFS(&bque_tfs), SCSI_INQ_BQUEFLAGS_BQUE,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_encserv,
           {"EncServ", "scsi.inquiry.encserv", FT_BOOLEAN, 8, TFS(&encserv_tfs), SCSI_INQ_BQUEFLAGS_ENCSERV,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_multip,
           {"MultiP", "scsi.inquiry.multip", FT_BOOLEAN, 8, TFS(&multip_tfs), SCSI_INQ_BQUEFLAGS_MULTIP,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_mchngr,
           {"MChngr", "scsi.inquiry.mchngr", FT_BOOLEAN, 8, TFS(&mchngr_tfs), SCSI_INQ_BQUEFLAGS_MCHNGR,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_sccsflags,
           {"Flags", "scsi.inquiry.sccsflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_sccs,
           {"SCCS", "scsi.inquiry.sccs", FT_BOOLEAN, 8, TFS(&sccs_tfs), SCSI_INQ_SCCSFLAGS_SCCS,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_acc,
           {"ACC", "scsi.inquiry.acc", FT_BOOLEAN, 8, TFS(&acc_tfs), SCSI_INQ_SCCSFLAGS_ACC,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_tpc,
           {"3PC", "scsi.inquiry.tpc", FT_BOOLEAN, 8, TFS(&tpc_tfs), SCSI_INQ_SCCSFLAGS_TPC,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_protect,
           {"Protect", "scsi.inquiry.protect", FT_BOOLEAN, 8, TFS(&protect_tfs), SCSI_INQ_SCCSFLAGS_PROTECT,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_tpgs,
           {"TPGS", "scsi.inquiry.tpgs", FT_UINT8, BASE_DEC, VALS(inq_tpgs_vals), 0x30,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_acaflags,
           {"Flags", "scsi.inquiry.acaflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_rmbflags,
           {"Flags", "scsi.inquiry.rmbflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_normaca,
           {"NormACA", "scsi.inquiry.normaca", FT_BOOLEAN, 8, TFS(&normaca_tfs), SCSI_INQ_ACAFLAGS_NORMACA,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_hisup,
           {"HiSup", "scsi.inquiry.hisup", FT_BOOLEAN, 8, TFS(&hisup_tfs), SCSI_INQ_ACAFLAGS_HISUP,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_aerc,
           {"AERC", "scsi.inquiry.aerc", FT_BOOLEAN, 8, TFS(&aerc_tfs), SCSI_INQ_ACAFLAGS_AERC,
            "AERC is obsolete from SPC-3 and forward", HFILL}},
@@ -5181,103 +5181,103 @@ proto_register_scsi (void)
            "TRMTSK is obsolete from SPC-2 and forward", HFILL}},
         { &hf_scsi_inq_rdf,
           {"Response Data Format", "scsi.inquiry.rdf", FT_UINT8, BASE_DEC, VALS(inq_rdf_vals), 0x0f,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_rluns_lun,
-          {"LUN", "scsi.reportluns.lun", FT_UINT8, BASE_DEC, NULL, 0x0, "",
+          {"LUN", "scsi.reportluns.lun", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_rluns_multilun,
-          {"Multi-level LUN", "scsi.reportluns.mlun", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Multi-level LUN", "scsi.reportluns.mlun", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_scsi_modesns_errrep,
           {"MRIE", "scsi.mode.mrie", FT_UINT8, BASE_HEX,
-           VALS (scsi_modesns_mrie_val), 0x0F, "", HFILL}},
+           VALS (scsi_modesns_mrie_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_modesns_tst,
           {"Task Set Type", "scsi.mode.tst", FT_UINT8, BASE_DEC,
-           VALS (scsi_modesns_tst_val), 0xE0, "", HFILL}},
+           VALS (scsi_modesns_tst_val), 0xE0, NULL, HFILL}},
         { &hf_scsi_modesns_qmod,
           {"Queue Algorithm Modifier", "scsi.mode.qmod", FT_UINT8, BASE_HEX,
-           VALS (scsi_modesns_qmod_val), 0xF0, "", HFILL}},
+           VALS (scsi_modesns_qmod_val), 0xF0, NULL, HFILL}},
         { &hf_scsi_modesns_qerr,
           {"Queue Error Management", "scsi.mode.qerr", FT_BOOLEAN, 8,
-           TFS (&scsi_modesns_qerr_val), 0x2, "", HFILL}},
+           TFS (&scsi_modesns_qerr_val), 0x2, NULL, HFILL}},
         { &hf_scsi_modesns_tas,
           {"Task Aborted Status", "scsi.mode.tac", FT_BOOLEAN, 8,
-           TFS (&scsi_modesns_tas_val), 0x80, "", HFILL}},
+           TFS (&scsi_modesns_tas_val), 0x80, NULL, HFILL}},
         { &hf_scsi_modesns_rac,
           {"Report a Check", "ssci.mode.rac", FT_BOOLEAN, 8,
-           TFS (&scsi_modesns_rac_val), 0x40, "", HFILL}},
+           TFS (&scsi_modesns_rac_val), 0x40, NULL, HFILL}},
         { &hf_scsi_protocol,
           {"Protocol", "scsi.proto", FT_UINT8, BASE_DEC, VALS (scsi_proto_val),
-           0x0F, "", HFILL}},
+           0x0F, NULL, HFILL}},
         { &hf_scsi_sns_errtype,
           {"SNS Error Type", "scsi.sns.errtype", FT_UINT8, BASE_HEX,
-           VALS (scsi_sns_errtype_val), 0x7F, "", HFILL}},
+           VALS (scsi_sns_errtype_val), 0x7F, NULL, HFILL}},
         { &hf_scsi_snskey,
           {"Sense Key", "scsi.sns.key", FT_UINT8, BASE_HEX,
-           VALS (scsi_sensekey_val), 0x0F, "", HFILL}},
+           VALS (scsi_sensekey_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_snsinfo,
-          {"Sense Info", "scsi.sns.info", FT_UINT32, BASE_HEX, NULL, 0x0, "",
+          {"Sense Info", "scsi.sns.info", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_addlsnslen,
           {"Additional Sense Length", "scsi.sns.addlen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_asc,
           {"Additional Sense Code", "scsi.sns.asc", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_ascq,
           {"Additional Sense Code Qualifier", "scsi.sns.ascq", FT_UINT8,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ascascq,
           {"Additional Sense Code+Qualifier", "scsi.sns.ascascq", FT_UINT16,
-           BASE_HEX, VALS (scsi_asc_val), 0x0, "", HFILL}},
+           BASE_HEX, VALS (scsi_asc_val), 0x0, NULL, HFILL}},
         { &hf_scsi_fru,
           {"Field Replaceable Unit Code", "scsi.sns.fru", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sksv,
-          {"SKSV", "scsi.sns.sksv", FT_BOOLEAN, 8, NULL, 0x80, "",
+          {"SKSV", "scsi.sns.sksv", FT_BOOLEAN, 8, NULL, 0x80, NULL,
            HFILL}},
         { &hf_scsi_persresv_key,
-          {"Reservation Key", "scsi.spc.resv.key", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Reservation Key", "scsi.spc.resv.key", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_scsi_persresv_scopeaddr,
-          {"Scope Address", "scsi.spc.resv.scopeaddr", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Scope Address", "scsi.spc.resv.scopeaddr", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_scsi_add_cdblen,
           {"Additional CDB Length", "scsi.spc.addcdblen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_svcaction,
           {"Service Action", "scsi.spc.svcaction", FT_UINT16, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_wb_mode,
           {"Mode", "scsi.spc.wb.mode", FT_UINT8, BASE_HEX,
-           VALS (scsi_wb_mode_val), 0xF, "", HFILL}},
+           VALS (scsi_wb_mode_val), 0xF, NULL, HFILL}},
         { &hf_scsi_wb_bufferid,
           {"Buffer ID", "scsi.spc.sb.bufid", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_wb_bufoffset,
           {"Buffer Offset", "scsi.spc.wb.bufoff", FT_UINT24, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_paramlen24,
           {"Parameter List Length", "scsi.cdb.paramlen24", FT_UINT24, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_senddiag_st_code,
           {"Self-Test Code", "scsi.spc.senddiag.code", FT_UINT8, BASE_HEX,
-           VALS (scsi_senddiag_st_code_val), 0xE0, "", HFILL}},
+           VALS (scsi_senddiag_st_code_val), 0xE0, NULL, HFILL}},
         { &hf_scsi_select_report,
           {"Select Report", "scsi.spc.select_report", FT_UINT8, BASE_HEX,
-           VALS (scsi_select_report_val), 0x00, "", HFILL}},
+           VALS (scsi_select_report_val), 0x00, NULL, HFILL}},
         { &hf_scsi_senddiag_pf,
           {"PF", "scsi.spc.senddiag.pf", FT_BOOLEAN, 8,
-           TFS (&scsi_senddiag_pf_val), 0x10, "", HFILL}},
+           TFS (&scsi_senddiag_pf_val), 0x10, NULL, HFILL}},
         { &hf_scsi_senddiag_st,
           {"Self Test", "scsi.spc.senddiag.st", FT_BOOLEAN, 8, NULL,
-           0x4, "", HFILL}},
+           0x4, NULL, HFILL}},
         { &hf_scsi_senddiag_devoff,
           {"Device Offline", "scsi.spc.senddiag.devoff", FT_BOOLEAN, 8,
-           NULL, 0x2, "", HFILL}},
+           NULL, 0x2, NULL, HFILL}},
         { &hf_scsi_senddiag_unitoff,
           {"Unit Offline", "scsi.spc.senddiag.unitoff", FT_BOOLEAN, 8,
-           NULL, 0x1, "", HFILL}},
+           NULL, 0x1, NULL, HFILL}},
         { &hf_scsi_request_frame,
           { "Request in", "scsi.request_frame", FT_FRAMENUM, BASE_NONE, NULL, 0,
            "The request to this transaction is in this frame", HFILL }},
@@ -5289,7 +5289,7 @@ proto_register_scsi (void)
            "The response to this transaction is in this frame", HFILL }},
         { &hf_scsi_fragments,
           { "SCSI Fragments", "scsi.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-           "SCSI Fragments", HFILL }},
+           NULL, HFILL }},
         { &hf_scsi_fragment_overlap,
           { "Fragment overlap",	"scsi.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
            "Fragment overlaps with other fragments", HFILL }},
@@ -5307,211 +5307,211 @@ proto_register_scsi (void)
            "Defragmentation error due to illegal fragments", HFILL }},
         { &hf_scsi_fragment,
           { "SCSI DATA Fragment", "scsi.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-           "SCSI DATA Fragment", HFILL }},
+           NULL, HFILL }},
         { &hf_scsi_reassembled_in,
           { "Reassembled SCSI DATA in frame", "scsi.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
            "This SCSI DATA packet is reassembled in this frame", HFILL }},
         { &hf_scsi_log_ppc_flags,
           {"PPC Flags", "scsi.log.ppc.flags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ppc,
           {"PPC", "scsi.log.ppc", FT_BOOLEAN, 8,
-          TFS (&scsi_log_ppc_tfs), 0x02, "", HFILL}},
+          TFS (&scsi_log_ppc_tfs), 0x02, NULL, HFILL}},
         { &hf_scsi_log_pcr,
           {"PCR", "scsi.log.pcr", FT_BOOLEAN, 8,
-          TFS (&scsi_log_pcr_tfs), 0x02, "", HFILL}},
+          TFS (&scsi_log_pcr_tfs), 0x02, NULL, HFILL}},
         { &hf_scsi_log_sp,
           {"SP", "scsi.log.sp", FT_BOOLEAN, 8,
-          TFS (&scsi_log_sp_tfs), 0x01, "", HFILL}},
+          TFS (&scsi_log_sp_tfs), 0x01, NULL, HFILL}},
         { &hf_scsi_log_pc_flags,
           {"PC Flags", "scsi.log.pc.flags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_page_length,
           {"Page Length", "scsi.log.page_length", FT_UINT16, BASE_DEC, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_parameter_code,
           {"Parameter Code", "scsi.log.parameter_code", FT_UINT16, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_param_flags,
           {"Param Flags", "scsi.log.param.flags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_param_len,
           {"Parameter Len", "scsi.log.param_len", FT_UINT8, BASE_DEC, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_param_data,
-          {"Parameter Data", "scsi.log.param_data", FT_BYTES, BASE_HEX, NULL, 0,
-           "", HFILL}},
+          {"Parameter Data", "scsi.log.param_data", FT_BYTES, BASE_NONE, NULL, 0,
+           NULL, HFILL}},
         { &hf_scsi_log_pf_du,
           {"DU", "scsi.log.pf.du", FT_BOOLEAN, 8, NULL, 0x80,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_ds,
           {"DS", "scsi.log.pf.ds", FT_BOOLEAN, 8, NULL, 0x40,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_tsd,
           {"TSD", "scsi.log.pf.tsd", FT_BOOLEAN, 8, NULL, 0x20,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_etc,
           {"ETC", "scsi.log.pf.etc", FT_BOOLEAN, 8, NULL, 0x10,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_tmc,
           {"TMC", "scsi.log.pf.tmc", FT_UINT8, BASE_HEX, VALS(log_flags_tmc_vals), 0x0c,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_lbin,
           {"LBIN", "scsi.log.pf.lbin", FT_BOOLEAN, 8, NULL, 0x02,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_lp,
           {"LP", "scsi.log.pf.lp", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rw,
           {"Read Warning", "scsi.log.ta.rw", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ww,
           {"write warning", "scsi.log.ta.ww", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_he,
           {"hard error", "scsi.log.ta.he", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_media,
           {"media", "scsi.log.ta.media", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rf,
           {"read failure", "scsi.log.ta.rf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wf,
           {"write failure", "scsi.log.ta.wf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ml,
           {"media life", "scsi.log.ta.ml", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ndg,
           {"not data grade", "scsi.log.ta.ndg", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wp,
           {"write protect", "scsi.log.ta.wp", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_nr,
           {"no removal", "scsi.log.ta.nr", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cm,
           {"cleaning media", "scsi.log.ta.cm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_uf,
           {"unsupported format", "scsi.log.ta.uf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rmcf,
           {"removable mechanical cartridge failure", "scsi.log.ta.rmcf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_umcf,
           {"unrecoverable mechanical cartridge failure", "scsi.log.ta.umcf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_mcicf,
           {"memory chip in cartridge failure", "scsi.log.ta.mcicf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_fe,
           {"forced eject", "scsi.log.ta.fe", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rof,
           {"read only format", "scsi.log.ta.rof", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tdcol,
           {"tape directory corrupted on load", "scsi.log.ta.tdcol", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_nml,
           {"nearing media life", "scsi.log.ta.nml", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cn,
           {"clean now", "scsi.log.ta.cn", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cp,
           {"clean periodic", "scsi.log.ta.cp", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ecm,
           {"expired cleaning media", "scsi.log.ta.ecm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ict,
           {"invalid cleaning tape", "scsi.log.ta.ict", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rr,
           {"retention requested", "scsi.log.ta.rr", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dpie,
           {"dual port interface error", "scsi.log.ta.dpie", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cff,
           {"cooling fan failure", "scsi.log.ta.cff", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_psf,
           {"power supply failure", "scsi.log.ta.psf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_pc,
           {"power consumption", "scsi.log.ta.pc", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dm,
           {"drive maintenance", "scsi.log.ta.dm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_hwa,
           {"hardware a", "scsi.log.ta.hwa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_hwb,
           {"hardware b", "scsi.log.ta.hwb", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_if,
           {"interface", "scsi.log.ta.if", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_em,
           {"eject media", "scsi.log.ta.em", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dwf,
           {"download failed", "scsi.log.ta.dwf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_drhu,
           {"drive humidity", "scsi.log.ta.drhu", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_drtm,
           {"drive temperature", "scsi.log.ta.drtm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_drvo,
           {"drive voltage", "scsi.log.ta.drvo", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_pefa,
           {"periodic failure", "scsi.log.ta.pefa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dire,
           {"diagnostics required", "scsi.log.ta.dire", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_lost,
           {"lost statistics", "scsi.log.ta.lost", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tduau,
           {"tape directory invalid at unload", "scsi.log.ta.tduau", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tsawf,
           {"tape system area write failure", "scsi.log.ta.tsawf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tsarf,
           {"tape system area read failure", "scsi.log.ta.tsarf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_nsod,
           {"no start of data", "scsi.log.ta.nsod", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_lofa,
           {"loading failure", "scsi.log.ta.lofa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_uuf,
           {"unrecoverable unload failure", "scsi.log.ta.uuf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_aif,
           {"automatic interface failure", "scsi.log.ta.aif", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_fwf,
           {"firmware failure", "scsi.log.ta.fwf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wmicf,
           {"worm medium integrity check failed", "scsi.log.ta.wmicf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wmoa,
           {"worm medium overwrite attempted", "scsi.log.ta.wmoa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
     };
 
     /* Setup protocol subtree array */