From 971ffd683ea23362bd8009567ff7860371e6e2cc Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 17 Jun 2014 17:30:58 +0200 Subject: Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman --- epan/dissectors/packet-synphasor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-synphasor.c') diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 61a920cca1..5374844350 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -669,7 +669,7 @@ static int dissect_config_frame(tvbuff_t *tvb, proto_item *config_item) gint oldoffset = offset; /* to calculate the length of the whole PMU block later */ /* STN with new tree to add the rest of the PMU block */ - str = tvb_get_string(wmem_packet_scope(), tvb, offset, CHNAM_LEN); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, CHNAM_LEN, ENC_ASCII); station_item = proto_tree_add_text(config_tree, tvb, offset, CHNAM_LEN, "Station #%i: \"%s\"", j + 1, str); station_tree = proto_item_add_subtree(station_item, ett_conf_station); offset += CHNAM_LEN; @@ -1148,7 +1148,7 @@ static gint dissect_CHNAM(tvbuff_t *tvb, proto_tree *tree, gint offset, gint cnt /* dissect the 'cnt' channel names */ for (i = 0; i < cnt; i++) { char *str; - str = tvb_get_string(wmem_packet_scope(), tvb, offset, CHNAM_LEN); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, CHNAM_LEN, ENC_ASCII); proto_tree_add_text(temp_tree, tvb, offset, CHNAM_LEN, "%s #%i: \"%s\"", prefix, i+1, str); offset += CHNAM_LEN; -- cgit v1.2.1