Mercurial > hg > octave-lojdl > gnulib-hg

changeset 3202:283d780ab032

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(print_unicode_char): Simplify accordingly.
author Jim Meyering <jim@meyering.net>
date Tue, 06 Mar 2001 18:11:01 +0000
parents 174d1262dd35
children 3b920adfcea5
files lib/unicodeio.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -124,13 +124,11 @@
       extern const char *locale_charset PARAMS ((void));
       const char *charset = locale_charset ();
 
-      is_utf8 = (charset != NULL && !strcmp (charset, UTF8_NAME));
+      is_utf8 = !strcmp (charset, UTF8_NAME);
 #if HAVE_ICONV
       if (!is_utf8)
 	{
-	  utf8_to_local = (charset != NULL
-			   ? iconv_open (charset, UTF8_NAME)
-			   : (iconv_t)(-1));
+	  utf8_to_local = iconv_open (charset, UTF8_NAME);
 	  if (utf8_to_local == (iconv_t)(-1))
 	    {
 	      /* For an unknown encoding, assume ASCII.  */