# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "mx.h"
#include "mh.h"
#include "thread.h"
#include "hcache.h"
-#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
if (i > mhs->max || !mhs->flags) {
newmax = i + 128;
- mem_realloc (&mhs->flags, sizeof (mhs->flags[0]) * (newmax + 1));
+ p_realloc(&mhs->flags, newmax + 1);
for (j = mhs->max + 1; j <= newmax; j++)
mhs->flags[j] = 0;
static void mhs_free_sequences (struct mh_sequences *mhs)
{
- mem_free (&mhs->flags);
+ p_delete(&mhs->flags);
}
static short mhs_check (struct mh_sequences *mhs, int i)
}
}
- mem_free (&buff);
+ p_delete(&buff);
safe_fclose (&fp);
}
}
if ((*fp = fdopen (fd, "w")) == NULL) {
- mem_free (tgt);
+ p_delete(tgt);
close (fd);
unlink (path);
return (-1);
unlink (tmpfname);
}
- mem_free (&tmpfname);
+ p_delete(&tmpfname);
}
static void mh_sequences_add_one (CONTEXT * ctx, int n, short unseen,
}
}
safe_fclose (&ofp);
- mem_free (&buff);
+ p_delete(&buff);
if (!unseen_done && unseen)
fprintf (nfp, "%s: %d\n", NONULL (MhUnseen), n);
if (safe_rename (tmpfname, sequences) != 0)
unlink (tmpfname);
- mem_free (&tmpfname);
+ p_delete(&tmpfname);
}
static void mh_update_maildir (struct maildir *md, struct mh_sequences *mhs)
if (!md || !*md)
return;
- mem_free (&(*md)->canon_fname);
+ p_delete(&(*md)->canon_fname);
if ((*md)->h)
mutt_free_header (&(*md)->h);
- mem_free (md);
+ p_delete(md);
}
static void maildir_free_maildir (struct maildir **md)
}
if (q == h->maildir_flags)
- mem_free (&h->maildir_flags);
+ p_delete(&h->maildir_flags);
else if (q)
*q = '\0';
}
else
h->path = str_dup (fname);
- entry = mem_calloc (sizeof (struct maildir), 1);
+ entry = p_new(struct maildir, 1);
entry->h = h;
entry->header_parsed = (ctx->magic == M_MH);
#ifdef USE_INODESORT
else
mutt_free_header (&p->h);
#ifdef USE_HCACHE
- mem_free (&data);
+ p_delete(&data);
#endif
}
#ifdef USE_HCACHE
}
if ((msg->fp = fdopen (fd, "w")) == NULL) {
- mem_free (&msg->path);
+ p_delete(&msg->path);
close (fd);
unlink (path);
return (-1);
if (safe_rename (msg->path, full) == 0) {
if (hdr)
str_replace (&hdr->path, path);
- mem_free (&msg->path);
+ p_delete(&msg->path);
/*
* Adjust the mtime on the file to match the time at which this
if (safe_rename (msg->path, path) == 0) {
if (hdr)
str_replace (&hdr->path, tmp);
- mem_free (&msg->path);
+ p_delete(&msg->path);
break;
}
else if (errno != EEXIST) {
safe_fclose (&fp);
if (safe_rename (tmp, buf) == -1)
unlink (tmp);
- mem_free (&tmp);
+ p_delete(&tmp);
}
}
/* routines common to maildir and mh */
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_access = access;
fmt->mx_sync_mailbox = mh_sync_mailbox;