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-hdfsdata.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-hdfsdata.c')
-rw-r--r-- | epan/dissectors/packet-hdfsdata.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c index 516c8fbeb8..a2e6f6bed9 100644 --- a/epan/dissectors/packet-hdfsdata.c +++ b/epan/dissectors/packet-hdfsdata.c @@ -149,7 +149,7 @@ dissect_variable_int_string(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offse int len = dissect_variable_length_long (tvb, hdfsdata_tree, offset); /* client id = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_clientid, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_clientid, tvb, *offset, len, ENC_ASCII); *offset += len; } @@ -165,7 +165,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token id = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenid, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenid, tvb, *offset, len, ENC_ASCII); *offset += len; len = tvb_get_guint8(tvb, *offset); @@ -173,7 +173,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token password = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenpassword, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenpassword, tvb, *offset, len, ENC_ASCII); *offset += len; len = tvb_get_guint8(tvb, *offset); @@ -181,7 +181,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token type = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokentype, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokentype, tvb, *offset, len, ENC_ASCII); *offset += len; len = tvb_get_guint8(tvb, *offset); @@ -189,7 +189,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token service = amount of bytes in previous; */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenservice, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenservice, tvb, *offset, len, ENC_ASCII); *offset += len; } @@ -360,7 +360,7 @@ dissect_write_response(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int offset) offset += 8; /* add the rest -> RESPONSE_DATA */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII); /* offset += (tvb_reported_length(tvb)); */ } @@ -428,7 +428,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* This message just contains data so we can display it all as one block */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII); } else { @@ -466,7 +466,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo } else { /* This message contains some form of data that we have not successfully been able to pattern match and catagorize. Display all of it as data. */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)), ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)), ENC_ASCII); } } } |