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-scsi-ssc.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-scsi-ssc.c')
-rw-r--r-- | epan/dissectors/packet-scsi-ssc.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index 298672d0ea..a095962e1e 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -1360,128 +1360,128 @@ proto_register_scsi_ssc(void) static hf_register_info hf[] = { { &hf_scsi_ssc_opcode, {"SSC Opcode", "scsi.ssc.opcode", FT_UINT8, BASE_HEX, - VALS (scsi_ssc_vals), 0x0, "", HFILL}}, + VALS (scsi_ssc_vals), 0x0, NULL, HFILL}}, { &hf_scsi_ssc_rdwr6_xferlen, {"Transfer Length", "scsi.ssc.rdwr6.xferlen", FT_UINT24, BASE_DEC, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_scsi_ssc_ver16_verlen, {"Verification Length", "scsi.ssc.verify16.verify_len", FT_UINT24, BASE_DEC, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_scsi_ssc_locate10_loid, {"Logical Object Identifier", "scsi.ssc.locate10.loid", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_scsi_ssc_locate16_loid, {"Logical Identifier", "scsi.ssc.locate16.loid", FT_UINT64, BASE_DEC, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_scsi_ssc_space6_count, {"Count", "scsi.ssc.space6.count", FT_INT24, BASE_DEC, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_scsi_ssc_space6_code, {"Code", "scsi.ssc.space6.code", FT_UINT8, BASE_HEX, VALS(space6_code_vals), 0x0f, - "", HFILL}}, + NULL, HFILL}}, { &hf_scsi_ssc_space16_count, {"Count", "scsi.ssc.space16.count", FT_UINT64, BASE_DEC, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_scsi_ssc_rdwr10_xferlen, {"Transfer Length", "scsi.ssc.rdwr10.xferlen", FT_UINT16, BASE_DEC, NULL, - 0x0, "", HFILL}}, + 0x0, NULL, HFILL}}, { &hf_scsi_ssc_erase_flags, {"Flags", "scsi.ssc.erase_flags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_fcs, {"FCS", "scsi.ssc.fcs", FT_BOOLEAN, 8, - NULL, 0x08, "", HFILL}}, + NULL, 0x08, NULL, HFILL}}, { &hf_scsi_ssc_lcs, {"LCS", "scsi.ssc.lcs", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, + NULL, 0x04, NULL, HFILL}}, { &hf_scsi_ssc_erase_immed, {"IMMED", "scsi.ssc.erase_immed", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, + NULL, 0x02, NULL, HFILL}}, { &hf_scsi_ssc_long, {"LONG", "scsi.ssc.long", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, + NULL, 0x01, NULL, HFILL}}, { &hf_scsi_ssc_partition, {"Partition", "scsi.ssc.partition", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_lbi, {"Logical Block Identifier", "scsi.ssc.lbi", FT_UINT64, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_verify, {"VERIFY", "scsi.ssc.verify", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, + NULL, 0x02, NULL, HFILL}}, { &hf_scsi_ssc_immed, {"IMMED", "scsi.ssc.immed", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, + NULL, 0x01, NULL, HFILL}}, { &hf_scsi_ssc_formatmedium_flags, {"Flags", "scsi.ssc.formatmedium_flags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_format, {"Format", "scsi.ssc.format", FT_UINT8, BASE_HEX, - VALS(format_vals), 0x0f, "", HFILL}}, + VALS(format_vals), 0x0f, NULL, HFILL}}, { &hf_scsi_ssc_loadunload_immed_flags, {"Immed", "scsi.ssc.loadunload_immed_flags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_loadunload_flags, {"Flags", "scsi.ssc.loadunload_flags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_hold, {"HOLD", "scsi.ssc.hold", FT_BOOLEAN, 8, - NULL, 0x08, "", HFILL}}, + NULL, 0x08, NULL, HFILL}}, { &hf_scsi_ssc_eot, {"EOT", "scsi.ssc.eot", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, + NULL, 0x04, NULL, HFILL}}, { &hf_scsi_ssc_reten, {"RETEN", "scsi.ssc.reten", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, + NULL, 0x02, NULL, HFILL}}, { &hf_scsi_ssc_load, {"LOAD", "scsi.ssc.load", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, + NULL, 0x01, NULL, HFILL}}, { &hf_scsi_ssc_locate_flags, {"Flags", "scsi.ssc.locate_flags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_bt, {"BT", "scsi.ssc.bt", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, + NULL, 0x04, NULL, HFILL}}, { &hf_scsi_ssc_cp, {"CP", "scsi.ssc.cp", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, + NULL, 0x02, NULL, HFILL}}, { &hf_scsi_ssc_dest_type, {"Dest Type", "scsi.ssc.dest_type", FT_UINT8, BASE_HEX, - VALS(dest_type_vals), 0x18, "", HFILL}}, + VALS(dest_type_vals), 0x18, NULL, HFILL}}, { &hf_scsi_ssc_bam_flags, {"Flags", "scsi.ssc.bam_flags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_bam, {"BAM", "scsi.ssc.bam", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, + NULL, 0x01, NULL, HFILL}}, { &hf_scsi_ssc_read6_flags, {"Flags", "scsi.ssc.read6_flags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL}}, + NULL, 0x0, NULL, HFILL}}, { &hf_scsi_ssc_sili, {"SILI", "scsi.ssc.sili", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, + NULL, 0x02, NULL, HFILL}}, { &hf_scsi_ssc_fixed, {"FIXED", "scsi.ssc.fixed", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, + NULL, 0x01, NULL, HFILL}}, { &hf_scsi_ssc_bytord, {"BYTORD", "scsi.ssc.bytord", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, + NULL, 0x04, NULL, HFILL}}, { &hf_scsi_ssc_bytcmp, {"BYTCMP", "scsi.ssc.bytcmp", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, + NULL, 0x02, NULL, HFILL}}, { &hf_scsi_ssc_verify16_immed, {"IMMED", "scsi.ssc.verify16_immed", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, + NULL, 0x04, NULL, HFILL}}, { &hf_scsi_ssc_medium_type, {"Medium Type", "scsi.ssc.medium_type", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, + NULL, 0x02, NULL, HFILL}}, { &hf_scsi_ssc_media, {"Media", "scsi.ssc.media", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, + NULL, 0x01, NULL, HFILL}}, { &hf_scsi_ssc_capacity_prop_value, {"Capacity Proportion Value", "scsi.ssc.cpv", FT_UINT16, BASE_DEC, - NULL, 0, "", HFILL}}, + NULL, 0, NULL, HFILL}}, }; |