diff options
| author | João Valverde <j@v6e.pt> | 2022-02-15 02:45:20 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2022-02-15 11:38:16 +0000 |
| commit | 8efad466c4e62b0371659c8fd1d909038c36da27 (patch) | |
| tree | 30fd6d3f87988d8b65dd52afcbcc88fbf0e28cc9 /epan/dissectors/packet-scsi.c | |
| parent | 8198dd51cd6c731f620c1c7edf370c9c70966a44 (diff) | |
Tools: Fix fix-encoding-args.pl ASCII string validation
Do not require a useless ENC_NA parameter for string encodings.
FT_STRING and FT_STRINGZ types don't have any ndianness.
Follow-up to 6ec429622c9258eefd388caf21ce92ab5b9f54b4.
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 095f915b23..6b4175857b 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2910,7 +2910,7 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } if (codeset == CODESET_ASCII) { if (identifier_type == DEVID_TYPE_VEND_ID_VEND_SPEC_ID) { - proto_tree_add_item(des_tree, hf_scsi_inq_vendor_id, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(des_tree, hf_scsi_inq_vendor_id, tvb, offset, 8, ENC_ASCII); proto_tree_add_item(des_tree, hf_scsi_inq_evpd_devid_identifier_str, tvb, offset + 8, idlen - 8, ENC_NA|ENC_ASCII); } else { proto_tree_add_item(des_tree, hf_scsi_inq_evpd_devid_identifier_str, tvb, offset, idlen, ENC_NA|ENC_ASCII); @@ -3362,15 +3362,15 @@ dissect_spc_inquiry(tvbuff_t *tvb_a, packet_info *pinfo, try_offset = dissect_spc_inq_reladrflags(try_tvb, try_offset, tree, version); /* vendor id */ - proto_tree_add_item(tree, hf_scsi_inq_vendor_id, try_tvb, try_offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_scsi_inq_vendor_id, try_tvb, try_offset, 8, ENC_ASCII); try_offset+=8; /* product id */ - proto_tree_add_item(tree, hf_scsi_inq_product_id, try_tvb, try_offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_scsi_inq_product_id, try_tvb, try_offset, 16, ENC_ASCII); try_offset+=16; /* product revision level */ - proto_tree_add_item(tree, hf_scsi_inq_product_rev, try_tvb, try_offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_scsi_inq_product_rev, try_tvb, try_offset, 4, ENC_ASCII); try_offset+=4; /* vendor specific, 20 bytes */ |