[xiph-cvs] cvs commit: vorbis-tools/share utf8.c

[Michael Smith]

msmith      02/01/26 21:26:09

  Modified:    share    utf8.c
  Log:
  Fix for bug #121 - charset selection was being done in the wrong order, such
  that the locale info couldn't be overridden by an env. variable.

Revision  Changes    Path
1.5       +3 -3      vorbis-tools/share/utf8.c

Index: utf8.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/share/utf8.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- utf8.c	2001/10/19 06:30:16	1.4
+++ utf8.c	2002/01/27 05:26:08	1.5
@@ -231,13 +231,13 @@
 void convert_set_charset(const char *charset)
 {
 
+  if (!charset)
+    charset = getenv("CHARSET");
+
 #ifdef HAVE_LANGINFO_CODESET
   if (!charset)
     charset = nl_langinfo(CODESET);
 #endif
-
-  if (!charset)
-    charset = getenv("CHARSET");
 
   free(current_charset);
   current_charset = 0;

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.