X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=e69a591699f27b0d0ffba9ea1f5b985d21f2bb5c;hp=0febef6c0ae4c96aa92ac03fe634a00cba4d6005;hb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c;hpb=23265c6d12ecb744cb38689e9d78a448089ac351

diff --git a/hcache.c b/hcache.c
index 0febef6..e69a591 100644
--- a/hcache.c
+++ b/hcache.c
@@ -39,6 +39,9 @@
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #ifdef USE_IMAP
 #include "message.h"
@@ -87,7 +90,7 @@ static void *lazy_malloc (size_t siz)
     siz = 4096;
   }
 
-  return mem_malloc (siz);
+  return xmalloc(siz);
 }
 
 static void lazy_realloc (void *ptr, size_t siz)
@@ -165,8 +168,7 @@ static void restore_char (char **c, const unsigned char *d, int *off)
     return;
   }
 
-  *c = mem_malloc (size);
-  memcpy (*c, d + *off, size);
+  *c = p_dup(d + *off, size);
   *off += size;
 }
 
@@ -197,7 +199,7 @@ static void restore_address (ADDRESS ** a, const unsigned char *d, int *off)
   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);
@@ -233,7 +235,7 @@ static void restore_list (LIST ** l, const unsigned char *d, int *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--;
@@ -271,7 +273,7 @@ static void restore_buffer (BUFFER ** b, const unsigned char *d, int *off)
     return;
   }
 
-  *b = mem_malloc (sizeof (BUFFER));
+  *b = p_new(BUFFER, 1);
 
   restore_char (&(*b)->data, d, off);
   restore_int (&offset, d, off);
@@ -309,7 +311,7 @@ restore_parameter (PARAMETER ** p, const unsigned char *d, int *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;
@@ -607,7 +609,7 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
 void *
 mutt_hcache_open(const char *path, const char *folder)
 {
-  struct header_cache *h = mem_calloc(1, sizeof (HEADER_CACHE));
+  struct header_cache *h = p_new(HEADER_CACHE, 1);
   int    flags = VL_OWRITER | VL_OCREAT;
   h->db = NULL;
   h->folder = str_dup(folder);
@@ -615,8 +617,8 @@ mutt_hcache_open(const char *path, const char *folder)
 
   if (!path || path[0] == '\0')
   {
-    mem_free(&h->folder);
-    mem_free(&h);
+    p_delete(&h->folder);
+    p_delete(&h);
     return NULL;
   }
 
@@ -630,8 +632,8 @@ mutt_hcache_open(const char *path, const char *folder)
     return h;
   else
   {
-    mem_free(&h->folder);
-    mem_free(&h);
+    p_delete(&h->folder);
+    p_delete(&h);
 
     return NULL;
   }
@@ -646,8 +648,8 @@ mutt_hcache_close(void *db)
     return;
 
   vlclose(h->db);
-  mem_free(&h->folder);
-  mem_free(&h);
+  p_delete(&h->folder);
+  p_delete(&h);
 }
 
 void *
@@ -671,7 +673,7 @@ mutt_hcache_fetch(void *db, const char *filename,
 
   if (! crc32_matches(data, h->crc))
   {
-    mem_free(&data);
+    p_delete(&data);
     return NULL;
   }
 
@@ -701,7 +703,7 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header,
 
   ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER);
 
-  mem_free(&data);
+  p_delete(&data);
 
   return ret;
 }
@@ -729,7 +731,7 @@ mutt_hcache_delete(void *db, const char *filename,
 
 void *mutt_hcache_open (const char *path, const char *folder)
 {
-  struct header_cache *h = mem_calloc (1, sizeof (HEADER_CACHE));
+  struct header_cache *h = p_new(HEADER_CACHE, 1);
   int pagesize =
     atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384;
   h->db = NULL;
@@ -737,8 +739,8 @@ void *mutt_hcache_open (const char *path, const char *folder)
   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;
   }
 
@@ -755,8 +757,8 @@ void *mutt_hcache_open (const char *path, const char *folder)
     return h;
   }
   else {
-    mem_free (&h->folder);
-    mem_free (&h);
+    p_delete(&h->folder);
+    p_delete(&h);
 
     return NULL;
   }
@@ -771,8 +773,8 @@ void mutt_hcache_close (void *db)
   }
 
   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,
@@ -796,7 +798,7 @@ 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;
   }
 
@@ -827,7 +829,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
 
   ret = gdbm_store (h->db, key, data, GDBM_REPLACE);
 
-  mem_free (&data.dptr);
+  p_delete(&data.dptr);
 
   return ret;
 }
@@ -881,7 +883,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
   h->crc = generate_crc32 ();
 
   if (!path || path[0] == '\0') {
-    mem_free (&h);
+    p_delete(&h);
     return NULL;
   }
 
@@ -891,13 +893,13 @@ void *mutt_hcache_open (const char *path, const char *folder)
 
   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;
   }
 
@@ -905,7 +907,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
   if (ret) {
     mx_unlock_file (h->lockfile, h->fd, 0);
     close (h->fd);
-    mem_free (&h);
+    p_delete(&h);
     return NULL;
   }
 
@@ -917,7 +919,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
       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;
     }
   }
@@ -933,7 +935,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
     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;
   }
 
@@ -952,7 +954,7 @@ void mutt_hcache_close (void *db)
   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,
@@ -975,7 +977,7 @@ 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;
   }
 
@@ -1007,7 +1009,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
 
   ret = h->db->put (h->db, NULL, &key, &data, 0);
 
-  mem_free (&data.data);
+  p_delete(&data.data);
 
   return ret;
 }