X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=77f3b5868d7b5a9898324c63d3ab9ce5a9c92504;hp=e089bf1ba361a69dca42c0c06d40b6e36b86dc48;hb=a2a7836df164f0e198ad34dbc2f82baf7847fb94;hpb=05bcba73c3b028d4c571b5cf754bfd4436e1f11c

diff --git a/hcache.c b/hcache.c
index e089bf1..77f3b58 100644
--- a/hcache.c
+++ b/hcache.c
@@ -45,14 +45,13 @@
 
 #include <lib-mime/mime.h>
 
+#include "charset.h"
 #include "mutt.h"
 #include <imap/message.h>
 #include "mx.h"
 #include "lib.h"
 
-#include "lib/debug.h"
-
-static struct header_cache {
+struct header_cache {
 #if defined(HAVE_QDBM)
   VILLA *db;
   char *folder;
@@ -68,14 +67,14 @@ static struct header_cache {
   int fd;
   char lockfile[_POSIX_PATH_MAX];
 #endif
-} HEADER_CACHE;
+};
 
 typedef union {
   struct timeval timeval;
   unsigned long uid_validity;
 } validate;
 
-static void *lazy_malloc (size_t siz)
+static void *lazy_malloc (ssize_t siz)
 {
   if (0 < siz && siz < 4096) {
     siz = 4096;
@@ -86,13 +85,13 @@ static void *lazy_malloc (size_t siz)
 
 static void lazy_realloc(void *ptr, ssize_t siz)
 {
-  void **p = (void **) ptr;
+  char **p = ptr;
 
   if (p != NULL && 0 < siz && siz < 4096) {
     return;
   }
 
-  p_realloc(p, siz);
+  p_realloc(&p, siz);
 }
 
 static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
@@ -129,25 +128,6 @@ static unsigned char *dump_char (char *c, unsigned char *d, int *off)
   return d;
 }
 
-#if 0
-static unsigned char *dump_char_size (char *c, unsigned char *d, int *off,
-                                      ssize_t size)
-{
-  if (c == NULL) {
-    size = 0;
-    d = dump_int (size, d, off);
-    return d;
-  }
-
-  d = dump_int (size, d, off);
-  lazy_realloc (&d, *off + size);
-  memcpy (d + *off, c, size);
-  *off += size;
-
-  return d;
-}
-#endif
-
 static void restore_char (char **c, const unsigned char *d, int *off)
 {
   unsigned int size;
@@ -201,7 +181,7 @@ static void restore_address (address_t ** a, const unsigned char *d, int *off)
   *a = NULL;
 }
 
-static unsigned char *dump_list (LIST * l, unsigned char *d, int *off)
+static unsigned char *dump_list (string_list_t * l, unsigned char *d, int *off)
 {
   unsigned int counter = 0;
   unsigned int start_off = *off;
@@ -219,14 +199,14 @@ static unsigned char *dump_list (LIST * l, unsigned char *d, int *off)
   return d;
 }
 
-static void restore_list (LIST ** l, const unsigned char *d, int *off)
+static void restore_list (string_list_t ** l, const unsigned char *d, int *off)
 {
   unsigned int counter;
 
   restore_int (&counter, d, off);
 
   while (counter) {
-    *l = p_new(LIST, 1);
+    *l = p_new(string_list_t, 1);
     restore_char (&(*l)->data, d, off);
     l = &(*l)->next;
     counter--;
@@ -235,45 +215,6 @@ static void restore_list (LIST ** l, const unsigned char *d, int *off)
   *l = NULL;
 }
 
-#if 0
-static unsigned char *dump_buffer (BUFFER * b, unsigned char *d, int *off)
-{
-  if (!b) {
-    d = dump_int (0, d, off);
-    return d;
-  }
-  else {
-    d = dump_int (1, d, off);
-  }
-
-  d = dump_char_size (b->data, d, off, b->dsize + 1);
-  d = dump_int (b->dptr - b->data, d, off);
-  d = dump_int (b->dsize, d, off);
-  d = dump_int (b->destroy, d, off);
-
-  return d;
-}
-
-static void restore_buffer (BUFFER ** b, const unsigned char *d, int *off)
-{
-  unsigned int used;
-  unsigned int offset;
-
-  restore_int (&used, d, off);
-  if (!used) {
-    return;
-  }
-
-  *b = p_new(BUFFER, 1);
-
-  restore_char (&(*b)->data, d, off);
-  restore_int (&offset, d, off);
-  (*b)->dptr = (*b)->data + offset;
-  restore_int (&(*b)->dsize, d, off);
-  restore_int ((unsigned int *) &(*b)->destroy, d, off);
-}
-#endif
-
 static unsigned char *dump_parameter (PARAMETER * p, unsigned char *d,
                                       int *off)
 {
@@ -425,7 +366,7 @@ static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
 }
 
 static
-unsigned int crc32 (unsigned int crc, unsigned char const *p, size_t len)
+unsigned int crc32 (unsigned int crc, unsigned char const *p, ssize_t len)
 {
   int i;
 
@@ -636,7 +577,7 @@ mutt_hcache_close(void *db)
 
 void *
 mutt_hcache_fetch(void *db, const char *filename,
-		  size_t(*keylen) (const char *fn))
+		  ssize_t(*keylen) (const char *fn))
 {
   struct header_cache *h = db;
   char path[_POSIX_PATH_MAX];
@@ -665,7 +606,7 @@ mutt_hcache_fetch(void *db, const char *filename,
 int
 mutt_hcache_store(void *db, const char *filename, HEADER * header,
 		  unsigned long uid_validity,
-		  size_t(*keylen) (const char *fn))
+		  ssize_t(*keylen) (const char *fn))
 {
   struct header_cache *h = db;
   char path[_POSIX_PATH_MAX];
@@ -692,7 +633,7 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header,
 
 int
 mutt_hcache_delete(void *db, const char *filename,
-		   size_t(*keylen) (const char *fn))
+		   ssize_t(*keylen) (const char *fn))
 {
   struct header_cache *h = db;
   char path[_POSIX_PATH_MAX];
@@ -713,7 +654,7 @@ mutt_hcache_delete(void *db, const char *filename,
 
 void *mutt_hcache_open (const char *path, const char *folder)
 {
-  struct header_cache *h = p_new(HEADER_CACHE, 1);
+  struct header_cache *h = p_new(struct header_cache, 1);
   int pagesize =
     atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384;
   h->db = NULL;
@@ -760,7 +701,7 @@ void mutt_hcache_close (void *db)
 }
 
 void *mutt_hcache_fetch (void *db, const char *filename,
-                         size_t (*keylen) (const char *fn))
+                         ssize_t (*keylen) (const char *fn))
 {
   struct header_cache *h = db;
   datum key;
@@ -789,7 +730,7 @@ void *mutt_hcache_fetch (void *db, const char *filename,
 
 int
 mutt_hcache_store (void *db, const char *filename, HEADER * header,
-                   unsigned long uid_validity, size_t (*keylen) (const char *fn))
+                   unsigned long uid_validity, ssize_t (*keylen) (const char *fn))
 {
   struct header_cache *h = db;
   datum key;
@@ -818,7 +759,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
 
 int
 mutt_hcache_delete (void *db, const char *filename,
-                    size_t (*keylen) (const char *fn))
+                    ssize_t (*keylen) (const char *fn))
 {
   datum key;
   struct header_cache *h = db;
@@ -838,7 +779,7 @@ mutt_hcache_delete (void *db, const char *filename,
 }
 #elif defined(HAVE_DB4)
 
-static void mutt_hcache_dbt_init (DBT * dbt, void *data, size_t len)
+static void mutt_hcache_dbt_init (DBT * dbt, void *data, ssize_t len)
 {
   dbt->data = data;
   dbt->size = dbt->ulen = len;
@@ -858,7 +799,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
   struct stat sb;
   u_int32_t createflags = DB_CREATE;
   int ret;
-  struct header_cache *h = calloc (1, sizeof (HEADER_CACHE));
+  struct header_cache *h = p_new(struct header_cache, 1);
   int pagesize = atoi (HeaderCachePageSize);
 
 
@@ -940,7 +881,7 @@ void mutt_hcache_close (void *db)
 }
 
 void *mutt_hcache_fetch (void *db, const char *filename,
-                         size_t (*keylen) (const char *fn))
+                         ssize_t (*keylen) (const char *fn))
 {
   DBT key;
   DBT data;
@@ -968,7 +909,7 @@ void *mutt_hcache_fetch (void *db, const char *filename,
 
 int
 mutt_hcache_store (void *db, const char *filename, HEADER * header,
-                   unsigned long uid_validity, size_t (*keylen) (const char *fn))
+                   unsigned long uid_validity, ssize_t (*keylen) (const char *fn))
 {
   DBT key;
   DBT data;
@@ -998,7 +939,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
 
 int
 mutt_hcache_delete (void *db, const char *filename,
-                    size_t (*keylen) (const char *fn))
+                    ssize_t (*keylen) (const char *fn))
 {
   DBT key;
   struct header_cache *h = db;