diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-23 22:58:45 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-23 22:58:45 +0000 |
| commit | d7a184020418cfa3b62f8983045015b5f9521600 (patch) | |
| tree | fd74f7a4c2d4a44f5a145561dc897bbb452c128d /epan/dissectors/packet-srvloc.c | |
| parent | 051d46467f516b623ab4ce039ac06e0f0a5d505f (diff) | |
Replace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_string();
Fix encoding arg as needed.
svn path=/trunk/; revision=39530
Diffstat (limited to 'epan/dissectors/packet-srvloc.c')
| -rw-r--r-- | epan/dissectors/packet-srvloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 5af397d1cf..786bf1a8a2 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -416,7 +416,7 @@ add_v1_string(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length, switch (encoding) { case CHARSET_ISO_10646_UCS_2: - unicode_str = tvb_get_ephemeral_faked_unicode(tvb, offset, length/2, FALSE); + unicode_str = tvb_get_ephemeral_unicode_string(tvb, offset, length/2, ENC_BIG_ENDIAN); proto_tree_add_string(tree, hf, tvb, offset, length, unicode_str); break; @@ -439,7 +439,7 @@ add_v1_string(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length, * does not specify (it is a 16-bit integer space) * * Does that mean that in SRVLOC, ISO-10646-UCS-2 is always big-endian? - * If so, can we just use "tvb_get_ephemeral_faked_unicode()" and be + * If so, can we just use "tvb_get_ephemeral_unicode_string()" and be * done with it? * * XXX - this is also used with CHARSET_UTF_8. Is that a cut-and-pasteo? @@ -545,14 +545,14 @@ attr_list(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length, break; } /* Parse the attribute name */ - tmp = tvb_get_ephemeral_faked_unicode(tvb, offset, (length-offset)/2, FALSE); + tmp = tvb_get_ephemeral_unicode_string(tvb, offset, (length-offset)/2, ENC_BIG_ENDIAN); type_len = (int)strcspn(tmp, "="); - attr_type = tvb_get_ephemeral_faked_unicode(tvb, offset, type_len, FALSE); + attr_type = tvb_get_ephemeral_unicode_string(tvb, offset, type_len, ENC_BIG_ENDIAN); proto_tree_add_string(tree, hf, tvb, offset, type_len*2, attr_type); offset += (type_len*2)+2; /* If this is the attribute svcname */ if (strcmp(attr_type, "svcname-ws")==0) { - tmp = tvb_get_ephemeral_faked_unicode(tvb, offset, (length-offset)/2, FALSE); + tmp = tvb_get_ephemeral_unicode_string(tvb, offset, (length-offset)/2, ENC_BIG_ENDIAN); type_len = (int)strcspn(tmp, ")"); add_v1_string(tree, hf_srvloc_srvrply_svcname, tvb, offset, type_len*2, encoding); offset += (type_len*2)+4; |