diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-05-24 17:39:54 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-05-25 01:07:36 +0000 |
| commit | 03c5da8d8930c0456888a4d13ed2648513565d5c (patch) | |
| tree | df40e79374047bd27689152c619ced55d977610a /epan/tvbuff.c | |
| parent | 1fd3003a6d445047e99d13f6804b5b84425a7a46 (diff) | |
Add Windows code page 1252.
While we're at it, add the Euro to code page 1251, expand the comments
for 1250 and 1251 and some DOS code pages, and add support for code page
1251 to tvb_get_stringz_enc().
Change-Id: I053d58f87cac26ad7c109e2f1cd8807ffec0622d
Reviewed-on: https://code.wireshark.org/review/33342
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index e565e47d8c..5d87dda873 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -2850,6 +2850,10 @@ tvb_get_string_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, strptr = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_cp1251); break; + case ENC_WINDOWS_1252: + strptr = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_cp1252); + break; + case ENC_MAC_ROMAN: strptr = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_mac_roman); break; @@ -3208,6 +3212,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_WINDOWS_1251: + strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_cp1251); + break; + + case ENC_WINDOWS_1252: + strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_cp1252); + break; + case ENC_MAC_ROMAN: strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_mac_roman); break; |