osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use g_get_charset instead of g_get_codeset. 

From Guy via
https://www.wireshark.org/lists/wireshark-dev/201605/msg00027.html

Change-Id: I7884cecb6cd87f474ecc3f84253797fe57f62487
Reviewed-on: https://code.wireshark.org/review/15421
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2016-05-13 09:22:34 -07:00 committed by Anders Broman
parent 8c95f96599
commit bda417a54f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/print_stream.c
View File

@ -28,8 +28,6 @@
#ifdef _WIN32
#include <windows.h>
#else
#include <string.h>
#endif
#include <glib.h>
@ -146,14 +144,14 @@ print_line_text(print_stream_t *self, int indent, const char *line)
#ifndef _WIN32
/* Is there a more reliable way to do this? */
if (!tty_codeset) {
gchar *upper_codeset;
const gchar *charset;
gboolean is_utf8;
tty_codeset = g_get_codeset();
upper_codeset = g_ascii_strup(tty_codeset, -1);
if (!strstr(upper_codeset, "UTF-8") && !strstr(upper_codeset, "UTF8")) {
is_utf8 = g_get_charset(&charset);
tty_codeset = g_strdup(charset);
if (!is_utf8) {
to_codeset = tty_codeset;
}
g_free(upper_codeset);
}
#endif