X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9d211736c4ff802eef68d2264feacbe001f83e61..628b193daced4357675de5127ff8129cf6f81b0f:/uip/mhfree.c

diff --git a/uip/mhfree.c b/uip/mhfree.c
index cf9e548e..29756876 100644
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -9,7 +9,6 @@
  */
 
 #include <h/mh.h>
-#include <errno.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
@@ -107,7 +106,7 @@ free_content (CT ct)
 
     if (ct->c_file) {
 	if (ct->c_unlink)
-	    unlink (ct->c_file);
+	    (void) m_unlink (ct->c_file);
 	free (ct->c_file);
     }
     if (ct->c_fp)
@@ -262,10 +261,7 @@ free_external (CT ct)
 void
 free_encoding (CT ct, int toplevel)
 {
-    CE ce;
-
-    if (!(ce = ct->c_cefile))
-	return;
+    CE ce = &ct->c_cefile;
 
     if (ce->ce_fp) {
 	fclose (ce->ce_fp);
@@ -274,15 +270,12 @@ free_encoding (CT ct, int toplevel)
 
     if (ce->ce_file) {
 	if (ce->ce_unlink)
-	    unlink (ce->ce_file);
+	    (void) m_unlink (ce->ce_file);
 	free (ce->ce_file);
 	ce->ce_file = NULL;
     }
 
-    if (toplevel) {
-	free ((char *) ce);
-	ct->c_cefile = NULL;
-    } else {
+    if (! toplevel) {
 	ct->c_ceopenfnx = NULL;
     }
 }