Don't `else' after goto. Simplify control flow.

[nmh] / sbr / check_charset.c

diff --git a/sbr/check_charset.c b/sbr/check_charset.c
index 8ee93b1e22209367c19c31f2ed76d9d3d9c0c7f4..cc93273fec1f78394f1ffffa4f7f79ea4476146c 100644 (file)
--- a/sbr/check_charset.c
+++ b/sbr/check_charset.c
@@ -8,10 +8,12 @@
  */
 
 #include <h/mh.h>
-#ifdef HAVE_LANGINFO_H
-# include <langinfo.h>
-#endif
 
+#include <langinfo.h>
+
+/* Only get_charset() should use norm_charmap(), so hide its
+   declaration here. */
+char *norm_charmap(char *);
 
 /*
  * Get the current character set
@@ -19,12 +21,7 @@
 char *
 get_charset ()
 {
-    char *charset = getenv ("MM_CHARSET");
-#if defined(HAVE_NL_LANGINFO) && defined(CODESET)
-    if (!charset)
-       charset = norm_charmap(nl_langinfo (CODESET));
-#endif
-    return charset;
+    return norm_charmap(nl_langinfo (CODESET));
 }
 
 
@@ -51,7 +48,7 @@ check_charset (char *str, int len)
 
        /* US-ASCII is a subset of the ISO-8859-X and UTF-8 character sets */
        if (!strncasecmp("ISO-8859-", mm_charset, 9) ||
-               !mh_strcasecmp("UTF-8", mm_charset)) {
+               !strcasecmp("UTF-8", mm_charset)) {
            alt_charset = "US-ASCII";
            alt_len = strlen (alt_charset);
        }