aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-catapult-dct2000.c
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2022-10-04 00:01:47 +0100
committerJoão Valverde <j@v6e.pt>2022-10-14 11:00:46 +0100
commitceca3fed61ca121779a0b84b28e98ae6b1f4aeb6 (patch)
tree31ed20d617f932261fddf509bb086a4e32dced75 /epan/dissectors/packet-catapult-dct2000.c
parent8cca8074850690cee1bafc7734b02fb6c37d33e2 (diff)
DCT2000: Replace tvb_get_const_stringz()
Ping #18447.
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
-rw-r--r--epan/dissectors/packet-catapult-dct2000.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 9f63192150..07dd93881f 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -2449,10 +2449,10 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
/* by the wiretap module */
/* Context Name */
- context_name = tvb_get_const_stringz(tvb, offset, &context_length);
+ context_name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &context_length, ENC_ASCII);
if (dct2000_tree) {
- proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_context, tvb,
- offset, context_length, ENC_ASCII);
+ proto_tree_add_string(dct2000_tree, hf_catapult_dct2000_context, tvb,
+ offset, context_length, context_name);
}
offset += context_length;
@@ -2465,7 +2465,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
offset++;
/* Timestamp in file */
- timestamp_string = tvb_get_const_stringz(tvb, offset, &timestamp_length);
+ timestamp_string = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &timestamp_length, ENC_ASCII);
if (dct2000_tree) {
/* g_ascii_strtod(timestamp_string, NULL)) is much simpler, but *very* slow..
There will be seconds, a dot, and 4 decimal places.
@@ -2498,10 +2498,10 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
/* DCT2000 protocol name */
- protocol_name = tvb_get_const_stringz(tvb, offset, &protocol_length);
+ protocol_name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &protocol_length, ENC_ASCII);
if (dct2000_tree) {
- proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_protocol, tvb,
- offset, protocol_length, ENC_ASCII);
+ proto_tree_add_string(dct2000_tree, hf_catapult_dct2000_protocol, tvb,
+ offset, protocol_length, protocol_name);
}
is_comment = (strcmp(protocol_name, "comment") == 0);
if (!is_comment) {
@@ -2511,18 +2511,18 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
/* Protocol Variant */
- variant_string = tvb_get_const_stringz(tvb, offset, &variant_length);
+ variant_string = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &variant_length, ENC_ASCII);
if (!is_comment && !is_sprint) {
- proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_variant, tvb,
- offset, variant_length, ENC_ASCII);
+ proto_tree_add_string(dct2000_tree, hf_catapult_dct2000_variant, tvb,
+ offset, variant_length, variant_string);
}
offset += variant_length;
/* Outhdr (shown as string) */
- outhdr_string = tvb_get_const_stringz(tvb, offset, &outhdr_length);
+ outhdr_string = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &outhdr_length, ENC_ASCII);
if (!is_comment && !is_sprint && (outhdr_length > 1)) {
- proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_outhdr, tvb,
- offset, outhdr_length, ENC_ASCII);
+ proto_tree_add_string(dct2000_tree, hf_catapult_dct2000_outhdr, tvb,
+ offset, outhdr_length, outhdr_string);
}
offset += outhdr_length;