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-cimd.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-cimd.c')
| -rw-r--r-- | epan/dissectors/packet-cimd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 2ddc479b4c..106daf01a2 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -442,7 +442,7 @@ static void dissect_cimd_parameter(tvbuff_t *tvb, proto_tree *tree, gint pindex, (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr); proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, - startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); proto_tree_add_item(param_tree, (*vals_hdr_PC[pindex].hf_p), tvb, startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), ENC_ASCII|ENC_NA); } @@ -475,7 +475,7 @@ static void dissect_cimd_ud(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint s (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr ); proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, - startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); g_offset = startOffset + 1 + CIMD_PC_LENGTH + 1; g_size = endOffset - g_offset; @@ -680,7 +680,7 @@ static void dissect_cimd_dcs(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint ); proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, - startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); offset = startOffset + 1 + CIMD_PC_LENGTH + 1; dcs = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, endOffset - offset, ENC_ASCII), NULL, 10); @@ -728,7 +728,7 @@ static void dissect_cimd_error_code( tvbuff_t *tvb, proto_tree *tree, gint pinde param_tree = proto_tree_add_subtree(tree, tvb, startOffset + 1, endOffset - (startOffset + 1), (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr); - proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); err_code = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), ENC_ASCII), |