# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
+#include "enter.h"
+#include "state.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#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
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
- FREE (&err);
+ p_delete(&err);
rfc822_free_address (&adr);
return;
}
/* initialize a state structure */
- memset (&st, 0, sizeof (st));
+ p_clear(&st, 1);
if (option (OPTFORWQUOTE))
st.prefix = prefix;
/* 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
else {
mutt_make_attribution (Context, parent, tmpfp);
- memset (&st, 0, sizeof (STATE));
+ p_clear(&st, 1);
st.fpin = fp;
st.fpout = tmpfp;