Changeset 4b17a6c for util.c

Timestamp:

Apr 9, 2009, 12:32:56 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9d12aa5

Parents:

e6c59ba

Message:

Zephyr: Always send in UTF-8, never iso-latin-1.

File:

• util.c (modified) (1 diff)

util.c

@@ -725 +725 @@
   }
 }
-/* Attempts to convert 'in' to ISO-8859-1. Returns that if possible,
-   else returns UTF-8.
+/*
+ * Validate 'in' as UTF-8, and either return a copy of it, or an empty
+ * string if it is invalid utf-8.
  */
-char * owl_get_iso_8859_1_if_possible(char *in)
+char * owl_validate_utf8(char *in)
 {
   char *out;
   if (g_utf8_validate(in, -1, NULL)) {
-    out = g_convert(in, -1,
-                    "ISO-8859-1", "UTF-8",
-                    NULL, NULL, NULL);
-    if (!out) {
-      out = owl_strdup(in);
-    }
-  }
-  else {
+    out = owl_strdup(in);
+  } else {
     out = owl_strdup("");
   }