X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=e3a0b839d62255a056f8eae4f6c5770d3e4b7698;hp=e020974f6e0580054ee5a50786a7fa7b6c67569c;hb=10e80e482eff3762b0b8d41b0c7795b76704479c;hpb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84

diff --git a/main.c b/main.c
index e020974..e3a0b83 100644
--- a/main.c
+++ b/main.c
@@ -506,10 +506,10 @@ int main (int argc, char **argv)
   char *draftFile = NULL;
   char *newMagic = NULL;
   HEADER *msg = NULL;
-  LIST *attach = NULL;
-  LIST *commands = NULL;
-  LIST *queries = NULL;
-  LIST *alias_queries = NULL;
+  string_list_t *attach = NULL;
+  string_list_t *commands = NULL;
+  string_list_t *queries = NULL;
+  string_list_t *alias_queries = NULL;
   int sendflags = 0;
   int flags = 0;
   int version = 0;
@@ -706,7 +706,7 @@ int main (int argc, char **argv)
   /* set defaults and read init files */
   mx_init ();
   mutt_init (flags & M_NOSYSRC, commands);
-  mutt_free_list (&commands);
+  string_list_wipe(&commands);
 
   /* Initialize crypto */
   crypt_init ();
@@ -721,7 +721,7 @@ int main (int argc, char **argv)
     address_t *a;
 
     for (; alias_queries; alias_queries = alias_queries->next) {
-      if ((a = mutt_lookup_alias (alias_queries->data))) {
+      if ((a = alias_lookup(alias_queries->data))) {
         /* output in machine-readable form */
         mutt_addrlist_to_idna (a, NULL);
         mutt_write_address_list (a, stdout, 0, 0);
@@ -862,7 +862,7 @@ int main (int argc, char **argv)
     p_delete(&bodytext);
 
     if (attach) {
-      LIST *t = attach;
+      string_list_t *t = attach;
       BODY *a = NULL;
 
       while (t) {
@@ -876,12 +876,12 @@ int main (int argc, char **argv)
           if (!option (OPTNOCURSES))
             mutt_endwin (NULL);
           fprintf (stderr, _("%s: unable to attach file.\n"), t->data);
-          mutt_free_list (&attach);
+          string_list_wipe(&attach);
           exit (1);
         }
         t = t->next;
       }
-      mutt_free_list (&attach);
+      string_list_wipe(&attach);
     }
 
     ci_send_message (sendflags, msg, tempfile, NULL, NULL);