I broke DB4 while refactoring hcache.c.

diff --git a/hcache.c b/hcache.c
index 6939ced3451b5e863150aad0f43ba2754387d530..de310e214907b960658d5b8a6823524852e6d048 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -72,6 +72,9 @@ static struct header_cache
   int fd;
   char lockfile[_POSIX_PATH_MAX];
 } HEADER_CACHE;
+
+static void mutt_hcache_dbt_init(DBT * dbt, void *data, size_t len);
+static void mutt_hcache_dbt_empty_init(DBT * dbt);
 #endif
 
 typedef union
@@ -721,7 +724,7 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header,
 }
 
 int
-mutt_hcache_store_raw (void* db, const char* filename, char* data,
+mutt_hcache_store_raw (void* db, const char* filename, void* data,
                        size_t dlen, size_t(*keylen) (const char* fn))
 {
   struct header_cache *h = db;
@@ -754,7 +757,7 @@ mutt_hcache_store_raw (void* db, const char* filename, char* data,
   databuf.size = dlen;
   databuf.ulen = dlen;
   
-  return h->db->put(h->db, NULL, &key, &data, 0);
+  return h->db->put(h->db, NULL, &key, &databuf, 0);
 #else
   strncpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);

diff --git a/hcache.h b/hcache.h
index 24ad89ce746ee1333852561023f032da37f4260e..7f4e16eb548c21c1f576d9294f524e4f0f763c8b 100644 (file)
--- a/hcache.h
+++ b/hcache.h
@@ -29,7 +29,7 @@ void *mutt_hcache_fetch_raw (void *db, const char *filename,
                              size_t (*keylen)(const char *fn));
 int mutt_hcache_store(void *db, const char *filename, HEADER *h,
                       unsigned long uid_validity, size_t (*keylen)(const char *fn));
-int mutt_hcache_store_raw (void* db, const char* filename, char* data,
+int mutt_hcache_store_raw (void* db, const char* filename, void* data,
                            size_t dlen, size_t(*keylen) (const char* fn));
 int mutt_hcache_delete(void *db, const char *filename, size_t (*keylen)(const char *fn));