#include <stdlib.h>
#include <ctype.h>
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "buffer.h"
#include "pgp.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/str.h"
#include "lib/debug.h"
static int msg_parse_fetch (IMAP_HEADER * h, char *s);
static char *msg_parse_flags (IMAP_HEADER * h, char *s);
-#if USE_HCACHE
+#ifdef USE_HCACHE
static int msg_fetch_header_fetch (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
FILE * fp);
static size_t imap_hcache_keylen (const char *fn);
const char *want_headers =
"DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES LIST-POST X-LABEL";
-#if USE_HCACHE
+#ifdef USE_HCACHE
void *hc = NULL;
unsigned long *uid_validity = NULL;
char uid_buf[64];
idata->reopen &= ~IMAP_NEWMAIL_PENDING;
idata->newMailCount = 0;
-#if USE_HCACHE
+#ifdef USE_HCACHE
if ((hc = mutt_hcache_open (HeaderCache, ctx->path))) {
snprintf (buf, sizeof (buf),
rewind (fp);
memset (&h, 0, sizeof (h));
- h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ h.data = p_new(IMAP_HEADER_DATA, 1);
do {
mfhrc = 0;
rewind (fp);
- mem_free (&uid_validity);
+ p_delete(&uid_validity);
}
while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
/* freshen fp, h */
rewind (fp);
memset (&h, 0, sizeof (h));
- h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ h.data = p_new(IMAP_HEADER_DATA, 1);
/* this DO loop does two things:
* 1. handles untagged messages, so we can try again on the same msg
/* content built as a side-effect of mutt_read_rfc822_header */
ctx->hdrs[msgno]->content->length = h.content_length;
-#if USE_HCACHE
+#ifdef USE_HCACHE
sprintf (uid_buf, "/%u", h.data->uid);
mutt_hcache_store (hc, uid_buf, ctx->hdrs[msgno], idata->uid_validity,
&imap_hcache_keylen);
if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
imap_free_header_data ((void *)&h.data);
fclose (fp);
-#if USE_HCACHE
+#ifdef USE_HCACHE
mutt_hcache_close (hc);
#endif /* USE_HCACHE */
return -1;
}
}
-#if USE_HCACHE
+#ifdef USE_HCACHE
mutt_hcache_close (hc);
#endif /* USE_HCACHE */
return 0;
else {
unlink (cache->path);
- mem_free (&cache->path);
+ p_delete(&cache->path);
}
}
mutt_mktemp (path);
cache->path = str_dup (path);
if (!(msg->fp = safe_fopen (path, "w+"))) {
- mem_free (&cache->path);
+ p_delete(&cache->path);
return -1;
}
safe_fclose (&msg->fp);
if (cache->path) {
unlink (cache->path);
- mem_free (&cache->path);
+ p_delete(&cache->path);
}
return -1;
goto fail;
}
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return 0;
fail:
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return -1;
}
}
if (cmd.data)
- mem_free (&cmd.data);
+ p_delete(&cmd.data);
if (sync_cmd.data)
- mem_free (&sync_cmd.data);
- mem_free (&mx.mbox);
+ p_delete(&sync_cmd.data);
+ p_delete(&mx.mbox);
return 0;
fail:
if (cmd.data)
- mem_free (&cmd.data);
+ p_delete(&cmd.data);
if (sync_cmd.data)
- mem_free (&sync_cmd.data);
- mem_free (&mx.mbox);
+ p_delete(&sync_cmd.data);
+ p_delete(&mx.mbox);
return -1;
}
/* this should be safe even if the list wasn't used */
mutt_free_list (&(((IMAP_HEADER_DATA *) * data)->keywords));
- mem_free (data);
+ p_delete(data);
}
/* imap_set_flags: fill out the message header according to the flags from
unsigned char readonly;
memset (&newh, 0, sizeof (newh));
- newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ newh.data = p_new(IMAP_HEADER_DATA, 1);
debug_print (2, ("parsing FLAGS\n"));
if ((s = msg_parse_flags (&newh, s)) == NULL) {
- mem_free (&newh.data);
+ p_delete(&newh.data);
return NULL;
}
mutt_free_list (&(HEADER_DATA (h)->keywords));
HEADER_DATA (h)->keywords = newh.data->keywords;
- mem_free (&newh.data);
+ p_delete(&newh.data);
return s;
}
return rc;
}
-#if USE_HCACHE
+#ifdef USE_HCACHE
static size_t imap_hcache_keylen (const char *fn)
{
return str_len (fn);