projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop mem_alloc and mem_free, use my own hand crafted optmized macros that
[apps/madmutt.git]
/
mh.c
diff --git
a/mh.c
b/mh.c
index
cfe7c36
..
90cf30a
100644
(file)
--- a/
mh.c
+++ b/
mh.c
@@
-17,6
+17,8
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "mx.h"
#include "mh.h"
#include "mutt.h"
#include "mx.h"
#include "mh.h"
@@
-93,7
+95,7
@@
static void mhs_alloc (struct mh_sequences *mhs, int i)
static void mhs_free_sequences (struct mh_sequences *mhs)
{
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)
}
static short mhs_check (struct mh_sequences *mhs, int i)
@@
-175,7
+177,7
@@
static void mh_read_sequences (struct mh_sequences *mhs, const char *path)
}
}
}
}
-
mem_free
(&buff);
+
p_delete
(&buff);
safe_fclose (&fp);
}
safe_fclose (&fp);
}
@@
-216,7
+218,7
@@
static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
}
if ((*fp = fdopen (fd, "w")) == NULL) {
}
if ((*fp = fdopen (fd, "w")) == NULL) {
-
mem_free
(tgt);
+
p_delete
(tgt);
close (fd);
unlink (path);
return (-1);
close (fd);
unlink (path);
return (-1);
@@
-364,7
+366,7
@@
void mh_update_sequences (CONTEXT * ctx)
unlink (tmpfname);
}
unlink (tmpfname);
}
-
mem_free
(&tmpfname);
+
p_delete
(&tmpfname);
}
static void mh_sequences_add_one (CONTEXT * ctx, int n, short unseen,
}
static void mh_sequences_add_one (CONTEXT * ctx, int n, short unseen,
@@
-416,7
+418,7
@@
static void mh_sequences_add_one (CONTEXT * ctx, int n, short unseen,
}
}
safe_fclose (&ofp);
}
}
safe_fclose (&ofp);
-
mem_free
(&buff);
+
p_delete
(&buff);
if (!unseen_done && unseen)
fprintf (nfp, "%s: %d\n", NONULL (MhUnseen), n);
if (!unseen_done && unseen)
fprintf (nfp, "%s: %d\n", NONULL (MhUnseen), n);
@@
-431,7
+433,7
@@
static void mh_sequences_add_one (CONTEXT * ctx, int n, short unseen,
if (safe_rename (tmpfname, sequences) != 0)
unlink (tmpfname);
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)
}
static void mh_update_maildir (struct maildir *md, struct mh_sequences *mhs)
@@
-462,11
+464,11
@@
static void maildir_free_entry (struct maildir **md)
if (!md || !*md)
return;
if (!md || !*md)
return;
-
mem_free
(&(*md)->canon_fname);
+
p_delete
(&(*md)->canon_fname);
if ((*md)->h)
mutt_free_header (&(*md)->h);
if ((*md)->h)
mutt_free_header (&(*md)->h);
-
mem_free
(md);
+
p_delete
(md);
}
static void maildir_free_maildir (struct maildir **md)
}
static void maildir_free_maildir (struct maildir **md)
@@
-527,7
+529,7
@@
static void maildir_parse_flags (HEADER * h, const char *path)
}
if (q == h->maildir_flags)
}
if (q == h->maildir_flags)
-
mem_free
(&h->maildir_flags);
+
p_delete
(&h->maildir_flags);
else if (q)
*q = '\0';
}
else if (q)
*q = '\0';
}
@@
-904,7
+906,7
@@
void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
else
mutt_free_header (&p->h);
#ifdef USE_HCACHE
else
mutt_free_header (&p->h);
#ifdef USE_HCACHE
-
mem_free
(&data);
+
p_delete
(&data);
#endif
}
#ifdef USE_HCACHE
#endif
}
#ifdef USE_HCACHE
@@
-1068,7
+1070,7
@@
static int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr
}
if ((msg->fp = fdopen (fd, "w")) == NULL) {
}
if ((msg->fp = fdopen (fd, "w")) == NULL) {
-
mem_free
(&msg->path);
+
p_delete
(&msg->path);
close (fd);
unlink (path);
return (-1);
close (fd);
unlink (path);
return (-1);
@@
-1133,7
+1135,7
@@
static int maildir_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr)
if (safe_rename (msg->path, full) == 0) {
if (hdr)
str_replace (&hdr->path, path);
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
/*
* Adjust the mtime on the file to match the time at which this
@@
-1219,7
+1221,7
@@
static int _mh_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr,
if (safe_rename (msg->path, path) == 0) {
if (hdr)
str_replace (&hdr->path, tmp);
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) {
break;
}
else if (errno != EEXIST) {
@@
-1720,7
+1722,7
@@
static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
safe_fclose (&fp);
if (safe_rename (tmp, buf) == -1)
unlink (tmp);
safe_fclose (&fp);
if (safe_rename (tmp, buf) == -1)
unlink (tmp);
-
mem_free
(&tmp);
+
p_delete
(&tmp);
}
}
}
}