warning fixes

[apps/madmutt.git] / charset.c

diff --git a/charset.c b/charset.c
index 0b2d979..683afc9 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -24,6 +24,7 @@
 
 #include "mutt.h"
 #include "charset.h"
+#include "ascii.h"
 
 #include "lib/mem.h"
 #include "lib/intl.h"
@@ -43,8 +44,8 @@
  */
 
 static struct {
-  char *key;
-  char *pref;
+  const char *key;
+  const char *pref;
 } PreferredMIMENames[] = {
   {
   "ansi_x3.4-1968", "us-ascii"}, {
@@ -608,7 +609,7 @@ int mutt_convert_nonmime_string (char **ps)
 
   for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
     char *u = *ps;
-    char *s;
+    char *s = NULL;
     char *fromcode;
     size_t m, n;
     size_t ulen = str_len (*ps);