simplify some bits of code, also simplify includes.

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

diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index 51b6450..1fdcf0d 100644 (file)
--- a/lib-mime/rfc3676.c
+++ b/lib-mime/rfc3676.c
@@ -28,10 +28,7 @@
 
 #include <lib-ui/curses.h>
 
-#include "mutt.h"
-#include "handler.h"
 #include "state.h"
-#include "lib.h"
 
 #define FLOWED_MAX 77
 
@@ -138,7 +135,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
   *curline='\0';
 
   /* respect DelSP of RfC3676 only with f=f parts */
-  if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
+  if ((t = parameter_getval(a->parameter, "delsp"))) {
     delsp = m_strlen(t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
     t = NULL;
   }
@@ -220,15 +217,15 @@ int rfc3676_handler (BODY * a, STATE * s) {
 void rfc3676_space_stuff (HEADER* hdr) {
   FILE* in = NULL, *out = NULL;
   char buf[LONG_STRING];
-  char tmpfile[_POSIX_PATH_MAX];
+  char tmpf[_POSIX_PATH_MAX];
 
   if (!hdr || !hdr->content || !hdr->content->filename)
     return;
 
   if ((in = safe_fopen (hdr->content->filename, "r")) == NULL)
     return;
-  mutt_mktemp (tmpfile);
-  if ((out = safe_fopen (tmpfile, "w+")) == NULL) {
+  mutt_mktemp (tmpf);
+  if ((out = safe_fopen (tmpf, "w+")) == NULL) {
     fclose (in);
     return;
   }
@@ -241,7 +238,7 @@ void rfc3676_space_stuff (HEADER* hdr) {
   }
   fclose (in);
   fclose (out);
-  mutt_set_mtime (hdr->content->filename, tmpfile);
+  mutt_set_mtime (hdr->content->filename, tmpf);
   unlink (hdr->content->filename);
-  m_strreplace(&hdr->content->filename, tmpfile);
+  m_strreplace(&hdr->content->filename, tmpf);
 }