projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
begin to move ui code into the lib-ui
[apps/madmutt.git]
/
mh.c
diff --git
a/mh.c
b/mh.c
index
63c7bd7
..
f108bf9
100644
(file)
--- a/
mh.c
+++ b/
mh.c
@@
-463,7
+463,7
@@
static void maildir_free_entry (struct maildir **md)
p_delete(&(*md)->canon_fname);
if ((*md)->h)
p_delete(&(*md)->canon_fname);
if ((*md)->h)
-
mutt_free_header
(&(*md)->h);
+
header_delete
(&(*md)->h);
p_delete(md);
}
p_delete(md);
}
@@
-567,7
+567,7
@@
static HEADER *maildir_parse_message (int magic, const char *fname,
if ((f = fopen (fname, "r")) != NULL) {
if (!h)
if ((f = fopen (fname, "r")) != NULL) {
if (!h)
- h =
mutt_new_header
();
+ h =
header_new
();
h->env = mutt_read_rfc822_header (f, h, 0, 0);
fstat (fileno (f), &st);
h->env = mutt_read_rfc822_header (f, h, 0, 0);
fstat (fileno (f), &st);
@@
-610,7
+610,7
@@
static HEADER *maildir_parse_message (int magic, const char *fname,
static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
const char *subdir, const char *fname,
static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
const char *subdir, const char *fname,
- int *count, int is_old, ino_t inode)
+ int *count, int is_old, ino_t inode
__attribute__ ((unused))
)
{
struct maildir *entry;
HEADER *h = NULL;
{
struct maildir *entry;
HEADER *h = NULL;
@@
-624,7
+624,7
@@
static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
if (ctx->magic == M_MH)
h = maildir_parse_message (ctx->magic, buf, is_old, NULL);
else {
if (ctx->magic == M_MH)
h = maildir_parse_message (ctx->magic, buf, is_old, NULL);
else {
- h =
mutt_new_header
();
+ h =
header_new
();
h->old = is_old;
maildir_parse_flags (h, buf);
}
h->old = is_old;
maildir_parse_flags (h, buf);
}
@@
-819,7
+819,7
@@
void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
#endif
}
else
#endif
}
else
-
mutt_free_header
(&p->h);
+
header_delete
(&p->h);
#ifdef USE_HCACHE
p_delete(&data);
#endif
#ifdef USE_HCACHE
p_delete(&data);
#endif
@@
-887,7
+887,7
@@
static int maildir_read_dir (CONTEXT * ctx)
* Open a new (temporary) message in an MH folder.
*/
* Open a new (temporary) message in an MH folder.
*/
-static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr
__attribute__ ((unused))
)
{
return mh_mkstemp (dest, &msg->fp, &msg->path);
}
{
return mh_mkstemp (dest, &msg->fp, &msg->path);
}
@@
-1293,7
+1293,7
@@
static int maildir_sync_message (CONTEXT * ctx, int msgno)
return (0);
}
return (0);
}
-static int mh_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+static int mh_sync_mailbox (CONTEXT * ctx, int unused
__attribute__ ((unused))
, int *index_hint)
{
char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX];
int i, j;
{
char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX];
int i, j;
@@
-1468,7
+1468,7
@@
static void maildir_update_flags (CONTEXT * ctx, HEADER * o, HEADER * n)
* either subdirectory differently, as mail could be copied directly into
* the cur directory from another agent.
*/
* either subdirectory differently, as mail could be copied directly into
* the cur directory from another agent.
*/
-static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused
__attribute__ ((unused))
)
{
struct stat st_new; /* status of the "new" subdirectory */
struct stat st_cur; /* status of the "cur" subdirectory */
{
struct stat st_new; /* status of the "new" subdirectory */
struct stat st_cur; /* status of the "cur" subdirectory */
@@
-1555,7
+1555,7
@@
static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
ctx->hdrs[i]->trash = p->h->trash;
/* this is a duplicate of an existing header, so remove it */
ctx->hdrs[i]->trash = p->h->trash;
/* this is a duplicate of an existing header, so remove it */
-
mutt_free_header
(&p->h);
+
header_delete
(&p->h);
}
/* This message was not in the list of messages we just scanned.
* Check to see if we have enough information to know if the
}
/* This message was not in the list of messages we just scanned.
* Check to see if we have enough information to know if the
@@
-1605,7
+1605,7
@@
static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
*
*/
*
*/
-static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused
__attribute__ ((unused))
)
{
char buf[_POSIX_PATH_MAX];
struct stat st, st_cur;
{
char buf[_POSIX_PATH_MAX];
struct stat st, st_cur;
@@
-1674,7
+1674,7
@@
static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
if (!ctx->hdrs[i]->changed)
maildir_update_flags (ctx, ctx->hdrs[i], p->h);
if (!ctx->hdrs[i]->changed)
maildir_update_flags (ctx, ctx->hdrs[i], p->h);
-
mutt_free_header
(&p->h);
+
header_delete
(&p->h);
}
else /* message has disappeared */
occult = 1;
}
else /* message has disappeared */
occult = 1;
@@
-1788,7
+1788,7
@@
static int maildir_check_empty (const char *path)
DIR *dp;
struct dirent *de;
int r = 1; /* assume empty until we find a message */
DIR *dp;
struct dirent *de;
int r = 1; /* assume empty until we find a message */
- char realpath[_POSIX_PATH_MAX];
+ char
f
realpath[_POSIX_PATH_MAX];
int iter = 0;
/* Strategy here is to look for any file not beginning with a period */
int iter = 0;
/* Strategy here is to look for any file not beginning with a period */
@@
-1797,9
+1797,9
@@
static int maildir_check_empty (const char *path)
/* we do "cur" on the first iteration since its more likely that we'll
* find old messages without having to scan both subdirs
*/
/* we do "cur" on the first iteration since its more likely that we'll
* find old messages without having to scan both subdirs
*/
- snprintf (
realpath, sizeof (
realpath), "%s/%s", path,
+ snprintf (
frealpath, sizeof (f
realpath), "%s/%s", path,
iter == 0 ? "cur" : "new");
iter == 0 ? "cur" : "new");
- if ((dp = opendir (realpath)) == NULL)
+ if ((dp = opendir (
f
realpath)) == NULL)
return -1;
while ((de = readdir (dp))) {
if (*de->d_name != '.') {
return -1;
while ((de = readdir (dp))) {
if (*de->d_name != '.') {