X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=5ad138c795ff5a10b6ef445d78f4b783fb4d0bfe;hp=d607b4ff719b23460501779dded5e966e4532a25;hb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37;hpb=01bd0a7410e476abaebf03d820bcf31a5ec4c7c0

diff --git a/muttlib.c b/muttlib.c
index d607b4f..5ad138c 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -168,19 +168,13 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
 }
 
 
-
-void mutt_free_body (BODY ** p)
+static void body_wipe(BODY *b)
 {
-  BODY *a = *p, *b;
-
-  while (a) {
-    b = a;
-    a = a->next;
-
     if (b->parameter)
-      parameter_list_wipe(&b->parameter);
+        parameter_list_wipe(&b->parameter);
+
     if (b->unlink && b->filename) {
-      unlink (b->filename);
+        unlink (b->filename);
     }
 
     p_delete(&b->filename);
@@ -191,18 +185,25 @@ void mutt_free_body (BODY ** p)
     p_delete(&b->form_name);
 
     if (b->hdr) {
-      /* Don't free twice (b->hdr->content = b->parts) */
-      b->hdr->content = NULL;
-      header_delete(&b->hdr);
+        /* Don't free twice (b->hdr->content = b->parts) */
+        b->hdr->content = NULL;
+        header_delete(&b->hdr);
     }
 
     if (b->parts)
-      mutt_free_body (&b->parts);
+        mutt_free_body(&b->parts);
+}
 
-    p_delete(&b);
-  }
+DO_DELETE(BODY, body);
+
+void mutt_free_body(BODY **p)
+{
+    while (*p) {
+        BODY *b = *p;
+        *p = b->next;
 
-  *p = 0;
+        body_delete(&b);
+    }
 }
 
 HEADER *mutt_dup_header (HEADER * h)
@@ -400,17 +401,6 @@ char *_mutt_expand_path (char *s, ssize_t slen, int rx)
   return (s);
 }
 
-char *mutt_get_parameter (const char *s, PARAMETER * p)
-{
-    while (p) {
-        if (!ascii_strcasecmp(s, p->attribute))
-            return (p->value);
-        p = p->next;
-    }
-
-    return NULL;
-}
-
 void mutt_set_parameter (const char *attribute, const char *value,
                          PARAMETER ** p)
 {