X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=89d5d74333c2f2b0f357ca119687979ad6d9e6ac;hp=90a7307a56090abdb80e576eb1c6370851ce6fba;hb=9f1dbdb74d7ca296eaa5fcf45243f7e376d35eab;hpb=10b7c16c8905d1b7ceaeeb6cfab9ad2ec03d8780

diff --git a/charset.c b/charset.c
index 90a7307..89d5d74 100644
--- a/charset.c
+++ b/charset.c
@@ -25,29 +25,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <lib-lib/lib-lib.h>
 
-#include <ctype.h>
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <errno.h>
 #ifdef HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 #endif
 
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-
 #include "mutt.h"
 #include "charset.h"
 
@@ -82,7 +65,7 @@ void charset_initialize(void)
         m_strreplace(&Charset, "iso-8859-1");
     }
 
-    Charset_is_utf8    = !strcmp(Charset, "utf-8");
+    Charset_is_utf8    = !m_strcmp(Charset, "utf-8");
     CharsetReplacement = Charset_is_utf8 ? 0xfffd : '?';
 
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
@@ -138,14 +121,14 @@ int charset_is_utf8(const char *s)
 {
     char buf[SHORT_STRING];
     charset_canonicalize(buf, sizeof(buf), s);
-    return !strcmp(buf, "utf-8");
+    return !m_strcmp(buf, "utf-8");
 }
 
 int charset_is_us_ascii(const char *s)
 {
     char buf[SHORT_STRING];
     charset_canonicalize(buf, sizeof(buf), s);
-    return !strcmp(buf, "us-ascii");
+    return !m_strcmp(buf, "us-ascii");
 }