X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=953e70f1e226aa175cce07bd04f5d8fc99cfa40d;hp=77f3b5868d7b5a9898324c63d3ab9ce5a9c92504;hb=2ce8de509852f47a90f834b3e8d047e054810309;hpb=24a996896edb7b7fc8f5fd5950a07c4a52a42d05

diff --git a/hcache.c b/hcache.c
index 77f3b58..953e70f 100644
--- a/hcache.c
+++ b/hcache.c
@@ -8,22 +8,13 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
+
+#include <lib-lib/lib-lib.h>
 
 #ifdef USE_HCACHE
 
 #define MUTTNG_HCACHE_ID        "0x004"
 
-# ifdef HAVE_INTTYPES_H
-#  include <inttypes.h>
-# else
-#  ifdef HAVE_STDINT_H
-#   include <stdint.h>
-#  endif
-# endif
-
 #if defined(HAVE_QDBM)
 #include <depot.h>
 #include <cabin.h>
@@ -34,15 +25,7 @@
 #include <db.h>
 #endif
 
-#include <errno.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <lib-lib/mem.h>
 #include <lib-hash/hash.h>
-
 #include <lib-mime/mime.h>
 
 #include "charset.h"
@@ -74,24 +57,16 @@ typedef union {
   unsigned long uid_validity;
 } validate;
 
-static void *lazy_malloc (ssize_t siz)
-{
-  if (0 < siz && siz < 4096) {
-    siz = 4096;
-  }
+#define UPPER4K(i)  ((i & ~(4096 - 1)) + 4096)
 
-  return xmalloc(siz);
+static unsigned char *lazy_malloc(ssize_t siz)
+{
+    return p_new(unsigned char, UPPER4K(siz));
 }
 
-static void lazy_realloc(void *ptr, ssize_t siz)
+static void lazy_realloc(unsigned char **p, ssize_t siz)
 {
-  char **p = ptr;
-
-  if (p != NULL && 0 < siz && siz < 4096) {
-    return;
-  }
-
-  p_realloc(&p, siz);
+    p_realloc(p, UPPER4K(siz));
 }
 
 static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
@@ -215,7 +190,7 @@ static void restore_list (string_list_t ** l, const unsigned char *d, int *off)
   *l = NULL;
 }
 
-static unsigned char *dump_parameter (PARAMETER * p, unsigned char *d,
+static unsigned char *dump_parameter (parameter_t * p, unsigned char *d,
                                       int *off)
 {
   unsigned int counter = 0;
@@ -236,21 +211,19 @@ static unsigned char *dump_parameter (PARAMETER * p, unsigned char *d,
 }
 
 static void
-restore_parameter (PARAMETER ** p, const unsigned char *d, int *off)
+restore_parameter (parameter_t ** p, const unsigned char *d, int *off)
 {
   unsigned int counter;
 
   restore_int (&counter, d, off);
 
   while (counter) {
-    *p = p_new(PARAMETER, 1);
+    *p = parameter_new();
     restore_char (&(*p)->attribute, d, off);
     restore_char (&(*p)->value, d, off);
     p = &(*p)->next;
     counter--;
   }
-
-  *p = NULL;
 }
 
 static unsigned char *dump_body (BODY * c, unsigned char *d, int *off)
@@ -513,7 +486,7 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
   h->env = envelope_new();
   restore_envelope (h->env, d, &off);
 
-  h->content = mutt_new_body ();
+  h->content = body_new();
   restore_body (h->content, d, &off);
 
   restore_char (&h->maildir_flags, d, &off);