X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=46de91cd60fc274cf48a925a32be03591064acb0;hp=e0f0a8a54dc6cc69cba407cc0bd1e0c101272b68;hb=3ea753c6005292b3e3153ac7e1f7b7d2363955c9;hpb=841934011451205d8295ac955486f06c317fdf15

diff --git a/charset.c b/charset.c
index e0f0a8a..46de91c 100644
--- a/charset.c
+++ b/charset.c
@@ -25,6 +25,10 @@
 #include "mutt.h"
 #include "charset.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #ifndef EILSEQ
 # define EILSEQ EINVAL
 #endif
@@ -224,7 +228,7 @@ void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
 
   for (i = 0; PreferredMIMENames[i].key; i++)
     if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
-        !mutt_strcasecmp (scratch, PreferredMIMENames[i].key)) {
+        !safe_strcasecmp (scratch, PreferredMIMENames[i].key)) {
       strfcpy (dest, PreferredMIMENames[i].pref, dlen);
       return;
     }
@@ -415,7 +419,7 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
     FREE (ps);
     *ps = buf;
 
-    mutt_str_adjust (ps);
+    str_adjust (ps);
     return 0;
   }
   else
@@ -560,7 +564,7 @@ char *mutt_get_first_charset (const char *charset)
   if (!mutt_strlen (c))
     return "us-ascii";
   if (!(c1 = strchr (c, ':')))
-    return charset;
+    return ((char*) charset);
   strfcpy (fcharset, c, c1 - c + 1);
   return fcharset;
 }