diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-12 01:53:33 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-12 08:54:06 +0000 |
| commit | ae127f23fad7ad085793b1a8cbe931e6c6c82626 (patch) | |
| tree | 055f3ad9c39276dd5c611a06e97295917034c6df /epan/tvbuff.c | |
| parent | 538429cc758f04653da080c8d654ab0cc30e92c1 (diff) | |
| download | wireshark-ae127f23fad7ad085793b1a8cbe931e6c6c82626.tar.gz | |
Add Mac Roman and DOS CP437.
Change-Id: Ib96f2cf4ea71cd0cc2c703d58b9d254bf4c1248a
Reviewed-on: https://code.wireshark.org/review/1077
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 21c9f8f3c5..91e2202be2 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -2497,6 +2497,14 @@ tvb_get_string_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, strbuf = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_cp1250); break; + case ENC_MAC_ROMAN: + strbuf = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_mac_roman); + break; + + case ENC_CP437: + strbuf = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_cp437); + break; + case ENC_3GPP_TS_23_038_7BITS: { gint bit_offset = offset << 3; @@ -2796,6 +2804,14 @@ tvb_get_stringz_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, g strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_cp1250); break; + case ENC_MAC_ROMAN: + strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_mac_roman); + break; + + case ENC_CP437: + strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_cp437); + break; + case ENC_3GPP_TS_23_038_7BITS: REPORT_DISSECTOR_BUG("TS 23.038 7bits has no null character and doesn't support null-terminated strings"); break; |