diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-01-23 02:24:34 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-01-23 02:24:34 +0000 |
| commit | 138987aea08b0d4b47b25f9554d182f6ea799401 (patch) | |
| tree | b0bc75cec5021ad782292f24e1e6cd461f1f67ee /epan/dissectors/packet-ar_drone.c | |
| parent | 732db281e9da1a3009cf191a7705a766dfd397bf (diff) | |
Use tvb_get_string_enc() rather than tvb_get_string(). The version of
the AR.drone Developer Guide I found online mentioned ASCII but not
UTF-8.
svn path=/trunk/; revision=54923
Diffstat (limited to 'epan/dissectors/packet-ar_drone.c')
| -rw-r--r-- | epan/dissectors/packet-ar_drone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c index d08cd77697..84081e2f05 100644 --- a/epan/dissectors/packet-ar_drone.c +++ b/epan/dissectors/packet-ar_drone.c @@ -150,9 +150,9 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (offset < master_offset) return master_offset; - command = tvb_get_string(wmem_packet_scope(), tvb, master_offset, offset-master_offset); + command = tvb_get_string_enc(wmem_packet_scope(), tvb, master_offset, offset-master_offset, ENC_ASCII|ENC_NA); sub_item = proto_tree_add_string(ar_tree, hf_command, tvb, master_offset, -1, - tvb_get_string(wmem_packet_scope(), tvb, master_offset+3, offset-master_offset-3)); + tvb_get_string_enc(wmem_packet_scope(), tvb, master_offset+3, offset-master_offset-3, ENC_ASCII|ENC_NA)); if (!strncmp(command, "AT*PCMD", 7)) { @@ -545,7 +545,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data } ti = proto_tree_add_item(sub_tree, hf_CTRL_mode, tvb, offset, length, ENC_ASCII|ENC_NA); proto_item_append_text(ti, "%s", - str_to_str(tvb_get_string(wmem_packet_scope(), tvb, offset, length), CTRL_mode_vs, " (Unknown Mode)")); + str_to_str(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII|ENC_NA), CTRL_mode_vs, " (Unknown Mode)")); offset += (length + 1); /* Add File Size */ |