rationalize list handling in mutt a bit.

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index e911fed..a5ba72c 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1406,9 +1406,9 @@ void mutt_write_address_list (address_t * adr, FILE * fp, int linelen,
 /* need to write the list in reverse because they are stored in reverse order
  * when parsed to speed up threading
  */
-void mutt_write_references (LIST * r, FILE * f)
+void mutt_write_references (string_list_t * r, FILE * f)
 {
-  LIST **ref = NULL;
+  string_list_t **ref = NULL;
   int refcnt = 0, refmax = 0;
 
   for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
@@ -1446,7 +1446,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
 {
   char buffer[LONG_STRING];
   char *p;
-  LIST *tmp = env->userhdrs;
+  string_list_t *tmp = env->userhdrs;
   int has_agent = 0;            /* user defined user-agent header field exists */
   list2_t* hdrs = list_from_str (EditorHeaders, " ");
 
@@ -1602,7 +1602,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
   return (ferror (fp) == 0 ? 0 : -1);
 }
 
-static void encode_headers (LIST * h)
+static void encode_headers (string_list_t * h)
 {
   char *tmp;
   char *p;
@@ -2171,12 +2171,12 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
 
 void mutt_unprepare_envelope (ENVELOPE * env)
 {
-  LIST *item;
+  string_list_t *item;
 
   for (item = env->userhdrs; item; item = item->next)
     rfc2047_decode (&item->data);
 
-  address_delete (&env->mail_followup_to);
+  address_list_wipe(&env->mail_followup_to);
 
   /* back conversions */
   rfc2047_decode_adrlist (env->to);
@@ -2268,7 +2268,7 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to)
 
   ret = _mutt_bounce_message (fp, h, to, resent_from, from);
 
-  address_delete (&from);
+  address_list_wipe(&from);
 
   return ret;
 }
@@ -2297,7 +2297,7 @@ address_t *mutt_remove_duplicates (address_t * addr)
       *last = addr->next;
 
       addr->next = NULL;
-      address_delete (&addr);
+      address_list_wipe(&addr);
 
       addr = *last;
     }
@@ -2422,7 +2422,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
    */
 
   if (post && hdr->chain && hdr->chain) {
-    LIST *p;
+    string_list_t *p;
 
     fputs ("X-Mutt-Mix:", msg->fp);
     for (p = hdr->chain; p; p = p->next)