#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
BODY *mutt_new_body (void)
{
- BODY *p = (BODY *) mem_calloc (1, sizeof (BODY));
+ BODY *p = p_new(BODY, 1);
p->disposition = DISPATTACH;
p->use_disp = 1;
for (; l; l = l->next) {
/* If this pattern needs more matches, expand pmatch. */
if (l->nmatch > nmatch) {
- mem_realloc (&pmatch, l->nmatch * sizeof (regmatch_t));
+ p_realloc(&pmatch, l->nmatch);
nmatch = l->nmatch;
}