From 8efad466c4e62b0371659c8fd1d909038c36da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 15 Feb 2022 02:45:20 +0000 Subject: 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. --- epan/dissectors/packet-catapult-dct2000.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-catapult-dct2000.c') diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 5989158fc2..4ced9293ef 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2310,7 +2310,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo context_name = tvb_get_const_stringz(tvb, offset, &context_length); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_context, tvb, - offset, context_length, ENC_ASCII|ENC_NA); + offset, context_length, ENC_ASCII); } offset += context_length; @@ -2359,7 +2359,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo protocol_name = tvb_get_const_stringz(tvb, offset, &protocol_length); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_protocol, tvb, - offset, protocol_length, ENC_ASCII|ENC_NA); + offset, protocol_length, ENC_ASCII); } is_comment = (strcmp(protocol_name, "comment") == 0); if (!is_comment) { @@ -2372,7 +2372,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo variant_string = tvb_get_const_stringz(tvb, offset, &variant_length); if (!is_comment && !is_sprint) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_variant, tvb, - offset, variant_length, ENC_ASCII|ENC_NA); + offset, variant_length, ENC_ASCII); } offset += variant_length; @@ -2380,7 +2380,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo outhdr_string = tvb_get_const_stringz(tvb, offset, &outhdr_length); if (!is_comment && !is_sprint && (outhdr_length > 1)) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_outhdr, tvb, - offset, outhdr_length, ENC_ASCII|ENC_NA); + offset, outhdr_length, ENC_ASCII); } offset += outhdr_length; -- cgit v1.2.3