diff options
| -rw-r--r-- | debian/libwireshark0.symbols | 2 | ||||
| -rw-r--r-- | epan/charsets.c | 2 | ||||
| -rw-r--r-- | epan/charsets.h | 2 | ||||
| -rw-r--r-- | epan/tvbuff.c | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index 7e21652000..83a87b843f 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -706,7 +706,6 @@ libwireshark.so.0 libwireshark0 #MINVER# get_dissector_table_param@Base 1.99.2 get_dissector_table_selector_type@Base 1.9.1 get_dissector_table_ui_name@Base 1.9.1 - get_ebcdic_unichar2_string@Base 2.3.0 get_eo_by_name@Base 2.3.0 get_eo_packet_func@Base 2.3.0 get_eo_proto_id@Base 2.3.0 @@ -742,6 +741,7 @@ libwireshark.so.0 libwireshark0 #MINVER# get_manuf_name_if_known@Base 1.9.1 get_mptcp_stream_count@Base 2.0.0 get_node_field_value@Base 1.12.0~rc1 + get_nonascii_unichar2_string@Base 2.3.0 get_rose_ctx@Base 1.9.1 get_rtd_num_tables@Base 1.99.8 get_rtd_packet_func@Base 1.99.8 diff --git a/epan/charsets.c b/epan/charsets.c index c7559257e7..336f7fc6b9 100644 --- a/epan/charsets.c +++ b/epan/charsets.c @@ -1098,7 +1098,7 @@ const gunichar2 charset_table_ebcdic_cp037[256] = { * pointer to a UTF-8 string, allocated using the wmem scope. */ guint8 * -get_ebcdic_unichar2_string(wmem_allocator_t *scope, const guint8 *ptr, gint length, const gunichar2 table[256]) +get_nonascii_unichar2_string(wmem_allocator_t *scope, const guint8 *ptr, gint length, const gunichar2 table[256]) { wmem_strbuf_t *str; diff --git a/epan/charsets.h b/epan/charsets.h index 6d54d42fa6..055d05e698 100644 --- a/epan/charsets.h +++ b/epan/charsets.h @@ -99,7 +99,7 @@ get_ascii_7bits_string(wmem_allocator_t *scope, const guint8 *ptr, const gint bit_offset, gint no_of_chars); WS_DLL_PUBLIC guint8 * -get_ebcdic_unichar2_string(wmem_allocator_t *scope, const guint8 *ptr, gint length, const gunichar2 table[256]); +get_nonascii_unichar2_string(wmem_allocator_t *scope, const guint8 *ptr, gint length, const gunichar2 table[256]); WS_DLL_PUBLIC guint8 * get_t61_string(wmem_allocator_t *scope, const guint8 *ptr, gint length); 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: |