diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:30:58 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:13:58 +0000 |
| commit | 971ffd683ea23362bd8009567ff7860371e6e2cc (patch) | |
| tree | 28c9ada98d2e59b196fc839d39ab2448fd436968 /epan/dissectors/packet-xml.c | |
| parent | 421d817d70737ebd459b7027274bf38bb2d9a2ff (diff) | |
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-xml.c')
| -rw-r--r-- | epan/dissectors/packet-xml.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index ac311e0a72..2e98786680 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -350,7 +350,7 @@ static void before_xmpli(void *tvbparse_data, const void *wanted_data _U_, tvbpa proto_item *pi; proto_tree *pt; tvbparse_elem_t *name_tok = tok->sub->next; - gchar *name = tvb_get_string(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len); + gchar *name = tvb_get_string_enc(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len, ENC_ASCII); xml_ns_t *ns = (xml_ns_t *)g_hash_table_lookup(xmpli_names, name); xml_frame_t *new_frame; @@ -420,8 +420,8 @@ static void before_tag(void *tvbparse_data, const void *wanted_data _U_, tvbpars tvbparse_elem_t *leaf_tok = name_tok->sub->sub->next->next; xml_ns_t *nameroot_ns; - root_name = (gchar *)tvb_get_string(wmem_packet_scope(), root_tok->tvb, root_tok->offset, root_tok->len); - name = (gchar *)tvb_get_string(wmem_packet_scope(), leaf_tok->tvb, leaf_tok->offset, leaf_tok->len); + root_name = (gchar *)tvb_get_string_enc(wmem_packet_scope(), root_tok->tvb, root_tok->offset, root_tok->len, ENC_ASCII); + name = (gchar *)tvb_get_string_enc(wmem_packet_scope(), leaf_tok->tvb, leaf_tok->offset, leaf_tok->len, ENC_ASCII); name_orig_case = name; nameroot_ns = (xml_ns_t *)g_hash_table_lookup(xml_ns.elements, root_name); @@ -436,7 +436,7 @@ static void before_tag(void *tvbparse_data, const void *wanted_data _U_, tvbpars } } else { - name = tvb_get_string(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len); + name = tvb_get_string_enc(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len, ENC_ASCII); name_orig_case = wmem_strdup(wmem_packet_scope(), name); ascii_strdown_inplace(name); @@ -529,9 +529,9 @@ static void before_dtd_doctype(void *tvbparse_data, const void *wanted_data _U_, new_frame = (xml_frame_t *)wmem_alloc(wmem_packet_scope(), sizeof(xml_frame_t)); new_frame->type = XML_FRAME_DTD_DOCTYPE; - new_frame->name = (gchar *)tvb_get_string(wmem_packet_scope(), name_tok->tvb, + new_frame->name = (gchar *)tvb_get_string_enc(wmem_packet_scope(), name_tok->tvb, name_tok->offset, - name_tok->len); + name_tok->len, ENC_ASCII); new_frame->name_orig_case = new_frame->name; new_frame->value = NULL; insert_xml_frame(current_frame, new_frame); @@ -587,7 +587,7 @@ static void after_attrib(void *tvbparse_data, const void *wanted_data _U_, tvbpa proto_item *pi; xml_frame_t *new_frame; - name = tvb_get_string(wmem_packet_scope(), tok->sub->tvb, tok->sub->offset, tok->sub->len); + name = tvb_get_string_enc(wmem_packet_scope(), tok->sub->tvb, tok->sub->offset, tok->sub->len, ENC_ASCII); name_orig_case = wmem_strdup(wmem_packet_scope(), name); ascii_strdown_inplace(name); |