# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include "buffy.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <errno.h>
}
/* Invoke the builtin pager */
- memset (&info, 0, sizeof (pager_t));
+ p_clear(&info, 1);
info.hdr = cur;
info.ctx = Context;
rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
- mem_free (&err);
+ p_delete(&err);
rfc822_free_address (&adr);
return;
}
return;
err.data = errbuf;
err.dsize = sizeof (errbuf);
- memset (&token, 0, sizeof (token));
+ p_clear(&token, 1);
r = mutt_parse_rc_line (buffer, &token, &err);
- mem_free (&token.data);
+ p_delete(&token.data);
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
size_t l;
for (p = b->parameter; p; p = p->next) {
- l = str_len (buf);
+ l = m_strlen(buf);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
- mem_free (&b->subtype);
+ p_delete(&b->subtype);
mutt_parse_content_type (buf, b);