#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mx.h"
#include "compress.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <sys/stat.h>
offset -= (sizeof MMDF_SEP - 1);
/* allocate space for the new offsets */
- newOffset = mem_calloc (ctx->msgcount - first, sizeof (struct m_update_t));
- oldOffset = mem_calloc (ctx->msgcount - first, sizeof (struct m_update_t));
+ newOffset = p_new(struct m_update_t, ctx->msgcount - first);
+ oldOffset = p_new(struct m_update_t, ctx->msgcount - first);
for (i = first, j = 0; i < ctx->msgcount; i++) {
/*
}
static mx_t* reg_mx (void) {
- mx_t* fmt = mem_calloc (1, sizeof (mx_t));
+ mx_t* fmt = p_new(mx_t, 1);
fmt->local = 1;
fmt->mx_check_empty = mbox_check_empty;
fmt->mx_is_magic = mbox_is_magic;