lots of simplifications.

[apps/madmutt.git] / lib-mime / rfc1524.c

diff --git a/lib-mime/rfc1524.c b/lib-mime/rfc1524.c
index 576f212..39e46e6 100644 (file)
--- a/lib-mime/rfc1524.c
+++ b/lib-mime/rfc1524.c
@@ -338,7 +338,7 @@ rfc1524_mailcap_parse(BODY *a, const char *filename, const char *type,
             rfc1524_entry_init(entry);
         }
     }                           /* while (!found && (buf = mutt_read_line ())) */
-    fclose (fp);
+    m_fclose(&fp);
 
   error:
     p_delete(&buf);
@@ -437,7 +437,7 @@ int rfc1524_expand_filename (char *nametemplate,
       m_strcpy(newfile, nflen, oldfile);
   }
   else if (!oldfile) {
-    m_snsubst(newfile, nflen, nametemplate, "mutt");
+    m_file_fmt(newfile, nflen, nametemplate, "mutt");
   } else {                        /* oldfile && nametemplate */