summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-synphasor.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2014-06-17 17:30:58 +0200
committerAnders Broman <a.broman58@gmail.com>2014-06-18 14:13:58 +0000
commit971ffd683ea23362bd8009567ff7860371e6e2cc (patch)
tree28c9ada98d2e59b196fc839d39ab2448fd436968 /epan/dissectors/packet-synphasor.c
parent421d817d70737ebd459b7027274bf38bb2d9a2ff (diff)
downloadwireshark-971ffd683ea23362bd8009567ff7860371e6e2cc.tar.gz
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 <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-synphasor.c')
-rw-r--r--epan/dissectors/packet-synphasor.c4
1 files changed, 2 insertions, 2 deletions
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;