X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=953e70f1e226aa175cce07bd04f5d8fc99cfa40d;hp=da3d6bbc08b9b7b3198c9ebac9619b3bafae088f;hb=32962d1bbc4260395f7afa183e980a4d4dc3f990;hpb=01bd0a7410e476abaebf03d820bcf31a5ec4c7c0

diff --git a/hcache.c b/hcache.c
index da3d6bb..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,16 +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-lib/macros.h>
 #include <lib-hash/hash.h>
-
 #include <lib-mime/mime.h>
 
 #include "charset.h"
@@ -208,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;
@@ -229,7 +211,7 @@ 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;
 
@@ -504,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);