Use g_get_charset instead of g_get_codeset.
authorGerald Combs <gerald@wireshark.org>
Fri, 13 May 2016 16:22:34 +0000 (09:22 -0700)
committerAnders Broman <a.broman58@gmail.com>
Sat, 14 May 2016 07:59:46 +0000 (07:59 +0000)
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>
epan/print_stream.c

index 740773af2eb4a6124587b6a1fe309ef5b1696fb1..162bedaef3819dfe54d2fbb05443d2d7f07c3470 100644 (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