sort out some prototypes, put them where they belong.

[apps/madmutt.git] / hcache.c

diff --git a/hcache.c b/hcache.c
index 8560ef6..3902812 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -40,8 +40,7 @@
 #include <sys/time.h>
 #endif
 
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
 #include <lib-hash/hash.h>
 
 #include <lib-mime/mime.h>
@@ -208,7 +207,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,21 +228,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)
@@ -506,7 +503,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);