From b604fff1363e40f2327bd5765264f687eb1ec04a Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 12 Dec 2016 00:19:44 -0800 Subject: Rename non-EBCDIC-specific routines. Those routines can handle any single-byte character set whose characters map to characters in the Basic Multilingual Plane; it could be used for extended ASCII, but we have another routine for that, mapping only characters with code points > 0x7f, so we just say "nonascii" rather than "ebcdic". Change-Id: I3d55b5d58e3e7ab08f3dfbfdb57a0301a30e71d4 Reviewed-on: https://code.wireshark.org/review/19214 Reviewed-by: Guy Harris --- epan/tvbuff.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'epan/tvbuff.c') diff --git a/epan/tvbuff.c b/epan/tvbuff.c index fa448d3cd2..2ac01751b6 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -2470,12 +2470,12 @@ tvb_get_ascii_7bits_string(wmem_allocator_t *scope, tvbuff_t *tvb, * return a pointer to a UTF-8 string, allocated with the wmem scope. */ static guint8 * -tvb_get_ebcdic_unichar2_string(wmem_allocator_t *scope, tvbuff_t *tvb, gint offset, gint length, const gunichar2 table[256]) +tvb_get_nonascii_unichar2_string(wmem_allocator_t *scope, tvbuff_t *tvb, gint offset, gint length, const gunichar2 table[256]) { const guint8 *ptr; ptr = ensure_contiguous(tvb, offset, length); - return get_ebcdic_unichar2_string(scope, ptr, length, table); + return get_nonascii_unichar2_string(scope, ptr, length, table); } static guint8 * @@ -2647,14 +2647,14 @@ tvb_get_string_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, * same code point in all Roman-alphabet EBCDIC code * pages. */ - strptr = tvb_get_ebcdic_unichar2_string(scope, tvb, offset, length, charset_table_ebcdic); + strptr = tvb_get_nonascii_unichar2_string(scope, tvb, offset, length, charset_table_ebcdic); break; case ENC_EBCDIC_CP037: /* * EBCDIC code page 037. */ - strptr = tvb_get_ebcdic_unichar2_string(scope, tvb, offset, length, charset_table_ebcdic_cp037); + strptr = tvb_get_nonascii_unichar2_string(scope, tvb, offset, length, charset_table_ebcdic_cp037); break; case ENC_T61: @@ -2823,7 +2823,7 @@ tvb_get_ucs_4_stringz(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, } static guint8 * -tvb_get_ebcdic_unichar2_stringz(wmem_allocator_t *scope, tvbuff_t *tvb, gint offset, gint *lengthp, const gunichar2 table[256]) +tvb_get_nonascii_unichar2_stringz(wmem_allocator_t *scope, tvbuff_t *tvb, gint offset, gint *lengthp, const gunichar2 table[256]) { guint size; const guint8 *ptr; @@ -2833,7 +2833,7 @@ tvb_get_ebcdic_unichar2_stringz(wmem_allocator_t *scope, tvbuff_t *tvb, gint off /* XXX, conversion between signed/unsigned integer */ if (lengthp) *lengthp = size; - return get_ebcdic_unichar2_string(scope, ptr, size, table); + return get_nonascii_unichar2_string(scope, ptr, size, table); } static guint8 * @@ -2989,14 +2989,14 @@ tvb_get_stringz_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, g * same code point in all Roman-alphabet EBCDIC code * pages. */ - strptr = tvb_get_ebcdic_unichar2_stringz(scope, tvb, offset, lengthp, charset_table_ebcdic); + strptr = tvb_get_nonascii_unichar2_stringz(scope, tvb, offset, lengthp, charset_table_ebcdic); break; case ENC_EBCDIC_CP037: /* * EBCDIC code page 037. */ - strptr = tvb_get_ebcdic_unichar2_stringz(scope, tvb, offset, lengthp, charset_table_ebcdic_cp037); + strptr = tvb_get_nonascii_unichar2_stringz(scope, tvb, offset, lengthp, charset_table_ebcdic_cp037); break; case ENC_T61: -- cgit v1.2.1