X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=68ad4623dd5aa82cd661b4f1cc9d951bb7266813;hp=8f59859921d8505e7815b2c6e3ea11c6038d9d0d;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/recvcmd.c b/recvcmd.c
index 8f59859..68ad462 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -12,6 +12,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -28,9 +30,6 @@
 #include "copy.h"
 #include "mutt_idna.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 /* some helper functions to verify that we are exclusively operating
  * on message/rfc822 attachments
@@ -445,7 +444,7 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
 
   /* initialize a state structure */
 
-  memset (&st, 0, sizeof (st));
+  p_clear(&st, 1);
 
   if (option (OPTFORWQUOTE))
     st.prefix = prefix;
@@ -690,7 +689,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
     /* in case followup set Newsgroups: with Followup-To: if it present */
     if (!env->newsgroups && curenv &&
         str_casecmp (curenv->followup_to, "poster"))
-      env->newsgroups = str_dup (curenv->followup_to);
+      env->newsgroups = m_strdup(curenv->followup_to);
   }
   else
 #endif
@@ -830,7 +829,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   else {
     mutt_make_attribution (Context, parent, tmpfp);
 
-    memset (&st, 0, sizeof (STATE));
+    p_clear(&st, 1);
     st.fpin = fp;
     st.fpout = tmpfp;