#ifdef USE_HCACHE
-#define MUTTNG_HCACHE_ID "0x001"
+#define MUTTNG_HCACHE_ID "0x004"
# if HAVE_INTTYPES_H
# include <inttypes.h>
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#ifdef USE_IMAP
#include "message.h"
siz = 4096;
}
- return mem_malloc (siz);
+ return xmalloc(siz);
}
static void lazy_realloc (void *ptr, size_t siz)
return;
}
- *c = mem_malloc (size);
- memcpy (*c, d + *off, size);
+ *c = p_dup(d + *off, size);
*off += size;
}
restore_int (&counter, d, off);
while (counter) {
- *a = mem_malloc (sizeof (ADDRESS));
+ *a = p_new(ADDRESS, 1);
restore_char (&(*a)->personal, d, off);
restore_char (&(*a)->mailbox, d, off);
restore_int ((unsigned int *) &(*a)->group, d, off);
restore_int (&counter, d, off);
while (counter) {
- *l = mem_malloc (sizeof (LIST));
+ *l = p_new(LIST, 1);
restore_char (&(*l)->data, d, off);
l = &(*l)->next;
counter--;
return;
}
- *b = mem_malloc (sizeof (BUFFER));
+ *b = p_new(BUFFER, 1);
restore_char (&(*b)->data, d, off);
restore_int (&offset, d, off);
restore_int (&counter, d, off);
while (counter) {
- *p = mem_malloc (sizeof (PARAMETER));
+ *p = p_new(PARAMETER, 1);
restore_char (&(*p)->attribute, d, off);
restore_char (&(*p)->value, d, off);
p = &(*p)->next;
d = dump_char (e->supersedes, d, off);
d = dump_char (e->date, d, off);
d = dump_char (e->x_label, d, off);
+ d = dump_char (e->list_post, d, off);
#ifdef USE_NNTP
d = dump_char (e->newsgroups, d, off);
restore_char (&e->supersedes, d, off);
restore_char (&e->date, d, off);
restore_char (&e->x_label, d, off);
-
+ restore_char (&e->list_post, d, off);
+
#ifdef USE_NNTP
restore_char (&e->newsgroups, d, off);
restore_char (&e->xref, d, off);
if (!path || path[0] == '\0')
{
- mem_free(&h->folder);
- mem_free(&h);
+ p_delete(&h->folder);
+ p_delete(&h);
return NULL;
}
return h;
else
{
- mem_free(&h->folder);
- mem_free(&h);
+ p_delete(&h->folder);
+ p_delete(&h);
return NULL;
}
return;
vlclose(h->db);
- mem_free(&h->folder);
- mem_free(&h);
+ p_delete(&h->folder);
+ p_delete(&h);
}
void *
if (! crc32_matches(data, h->crc))
{
- mem_free(&data);
+ p_delete(&data);
return NULL;
}
ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER);
- mem_free(&data);
+ p_delete(&data);
return ret;
}
h->crc = generate_crc32 ();
if (!path || path[0] == '\0') {
- mem_free (&h->folder);
- mem_free (&h);
+ p_delete(&h->folder);
+ p_delete(&h);
return NULL;
}
return h;
}
else {
- mem_free (&h->folder);
- mem_free (&h);
+ p_delete(&h->folder);
+ p_delete(&h);
return NULL;
}
}
gdbm_close (h->db);
- mem_free (&h->folder);
- mem_free (&h);
+ p_delete(&h->folder);
+ p_delete(&h);
}
void *mutt_hcache_fetch (void *db, const char *filename,
data = gdbm_fetch (h->db, key);
if (!crc32_matches (data.dptr, h->crc)) {
- mem_free(&data.dptr);
+ p_delete(&data.dptr);
return NULL;
}
ret = gdbm_store (h->db, key, data, GDBM_REPLACE);
- mem_free (&data.dptr);
+ p_delete(&data.dptr);
return ret;
}
h->crc = generate_crc32 ();
if (!path || path[0] == '\0') {
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
h->fd = open (h->lockfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
if (h->fd < 0) {
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
if (mx_lock_file (h->lockfile, h->fd, 1, 0, 5)) {
close (h->fd);
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
if (ret) {
mx_unlock_file (h->lockfile, h->fd, 0);
close (h->fd);
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
h->env->close (h->env, 0);
mx_unlock_file (h->lockfile, h->fd, 0);
close (h->fd);
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
}
h->env->close (h->env, 0);
mx_unlock_file (h->lockfile, h->fd, 0);
close (h->fd);
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
h->env->close (h->env, 0);
mx_unlock_file (h->lockfile, h->fd, 0);
close (h->fd);
- mem_free (&h);
+ p_delete(&h);
}
void *mutt_hcache_fetch (void *db, const char *filename,
h->db->get (h->db, NULL, &key, &data, 0);
if (!crc32_matches (data.data, h->crc)) {
- mem_free(&data.data);
+ p_delete(&data.data);
return NULL;
}
ret = h->db->put (h->db, NULL, &key, &data, 0);
- mem_free (&data.data);
+ p_delete(&data.data);
return ret;
}