diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-06-12 18:17:15 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-06-12 18:17:15 +0000 |
| commit | 3dbf3b975a8071794177d4f9ee4c861e308aa114 (patch) | |
| tree | e1d449ef81a72ea8c83b5a2aa14df6feb8841b9d /epan/dissectors/packet-ansi_637.c | |
| parent | 41647faaba806f8313c65045df62a1f42d574067 (diff) | |
| download | wireshark-3dbf3b975a8071794177d4f9ee4c861e308aa114.tar.gz | |
Give somewhat more precise names for character encodings ("Unicode"
doesn't specify a single way to encode characters in an octet stream -
there's UTF-8 and UTF-16BE/LE, as well as UCS-2BE/LE for a subset of
Unicode, and "Latin" really means "ISO 8859-1" a/k/a "ISO Latin 1".
svn path=/trunk/; revision=49912
Diffstat (limited to 'epan/dissectors/packet-ansi_637.c')
| -rw-r--r-- | epan/dissectors/packet-ansi_637.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index 6543654611..c57f9bac84 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -453,7 +453,6 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) gchar *buf; tvbuff_t * tvb_out = NULL; - /*add more translation UCS , IA5 , latin , latin \ hebrew ,gsm 7BIT*/ gchar *utf8_text = NULL; GIConv cd; GError *l_conv_error = NULL; @@ -478,11 +477,11 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) break; case 0x02: str = "7-bit ASCII"; break; case 0x03: str = "IA5"; break; - case 0x04: str = "UNICODE"; break; + case 0x04: str = "UCS-2"; break; case 0x05: str = "Shift-JIS"; break; case 0x06: str = "Korean"; break; case 0x07: str = "Latin/Hebrew"; break; - case 0x08: str = "Latin"; break; + case 0x08: str = "ISO 8859-1"; break; case 0x09: str = "GSM 7-bit default alphabet"; break; default: str = "Reserved"; break; } @@ -652,7 +651,7 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) offset - saved_offset, ia5_637_bigbuf); } - else if (encoding == 0x04)/* UCS */ + else if (encoding == 0x04)/* UCS-2 (not UTF-16?) */ { saved_offset = offset - 1; required_octs = 2*num_fields; @@ -724,7 +723,7 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) g_iconv_close(cd); } } - else if (encoding == 0x08) /* Latin */ + else if (encoding == 0x08) /* ISO 8859-1 (a/k/a ISO Latin 1) */ { saved_offset = offset - 1; buf = (gchar*)ep_alloc(num_fields); |