X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=a40194df314acaa20e82b67322f186bad7611e1e;hp=d45211128e7a089f91545c8937036eaa9ae23b8d;hb=3692b834c97c9933088d7082464fec5ae903920f;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/init.c b/init.c
index d452111..a40194d 100644
--- a/init.c
+++ b/init.c
@@ -1405,7 +1405,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s,
 {
   alias_t *tmp = Aliases;
   alias_t *last = NULL;
-  const char *estr = NULL;
+  char *estr = NULL;
 
   if (!MoreArgs (s)) {
     m_strcpy(err->data, err->dsize, _("alias: no address"));
@@ -1446,6 +1446,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s,
   if (mutt_addrlist_to_idna (tmp->addr, &estr)) {
     snprintf (err->data, err->dsize,
               _("Warning: Bad IDN '%s' in alias '%s'.\n"), estr, tmp->name);
+    p_delete(&estr);
     return -1;
   }
 
@@ -1695,7 +1696,7 @@ static int check_dsn_return (const char* option __attribute__ ((unused)), unsign
 }
 
 /* check whether value for $dsn_notify would be valid */
-static int check_dsn_notify (const char* option, unsigned long p,
+static int check_dsn_notify (const char* option __attribute__ ((unused)), unsigned long p,
                              char* errbuf, ssize_t errlen) {
   list2_t* list = NULL;
   ssize_t i = 0;
@@ -2511,7 +2512,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   const char *p;
   char buffer[STRING], error[STRING];
   int default_rc = 0, need_pause = 0;
-  unsigned int i;
+  int i;
   BUFFER err;
 
   p_clear(&err, 1);
@@ -2661,9 +2662,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   if ((p = getenv ("EMAIL")) != NULL)
     From = rfc822_parse_adrlist (NULL, p);
 
-  mutt_set_langinfo_charset ();
-  mutt_set_charset (Charset);
-
+  charset_initialize();
 
   /* Set standard defaults */
   hash_map (ConfigOptions, mutt_set_default, 0);