Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / mhfree.c

diff --git a/uip/mhfree.c b/uip/mhfree.c
index 6918e0e..bf3382c 100644 (file)
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -30,7 +30,6 @@ void freects_done(int);
 static void free_text(CT);
 static void free_multi(CT);
 static void free_partial(CT);
-static void free_external(CT);
 
 
 /*
@@ -64,31 +63,25 @@ free_content(CT ct)
        ** parts which need to be freed.
        */
        switch (ct->c_type) {
-               case CT_MULTIPART:
-                       free_multi(ct);
-                       break;
-
-               case CT_MESSAGE:
-                       switch (ct->c_subtype) {
-                               case MESSAGE_PARTIAL:
-                                       free_partial(ct);
-                                       break;
-
-                               case MESSAGE_EXTERNAL:
-                                       free_external(ct);
-                                       break;
-                       }
-                       break;
-
-               case CT_TEXT:
-                       free_text(ct);
-                       break;
+       case CT_MULTIPART:
+               free_multi(ct);
+               break;
+
+       case CT_MESSAGE:
+               if (ct->c_subtype == MESSAGE_PARTIAL) {
+                       free_partial(ct);
+               }
+               break;
+
+       case CT_TEXT:
+               free_text(ct);
+               break;
        }
 
+       if (ct->c_charset)
+               free(ct->c_charset);
        if (ct->c_showproc)
                free(ct->c_showproc);
-       if (ct->c_termproc)
-               free(ct->c_termproc);
        if (ct->c_storeproc)
                free(ct->c_storeproc);
 
@@ -233,23 +226,6 @@ free_partial(CT ct)
 }
 
 
-static void
-free_external(CT ct)
-{
-       struct exbody *e;
-
-       if (!(e = (struct exbody *) ct->c_ctparams))
-               return;
-
-       free_content(e->eb_content);
-       if (e->eb_body)
-               free(e->eb_body);
-
-       free((char *) e);
-       ct->c_ctparams = NULL;
-}
-
-
 /*
 ** Free data structures related to encoding/decoding
 ** Content-Transfer-Encodings.