fixes, simplifictions

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-mx/hcache.c b/lib-mx/hcache.c
index 74ccb5d..070e56f 100644 (file)
--- a/lib-mx/hcache.c
+++ b/lib-mx/hcache.c
@@ -57,8 +57,6 @@ static int generate_crc32(void)
     crc = crc32(crc, "madmutt.2007.05.13", m_strlen("madmutt.2007.05.13"));
 #ifdef HAVE_LANGINFO_CODESET
     crc = crc32(crc, MCharset.charset, m_strlen(MCharset.charset));
     crc = crc32(crc, "madmutt.2007.05.13", m_strlen("madmutt.2007.05.13"));
 #ifdef HAVE_LANGINFO_CODESET
     crc = crc32(crc, MCharset.charset, m_strlen(MCharset.charset));

-    crc = crc32(crc, "HAVE_LANGINFO_CODESET",
-                m_strlen("HAVE_LANGINFO_CODESET"));

 #endif
     crc = crc32(crc, "USE_POP",   m_strlen("USE_POP"));
     crc = crc32(crc, "MIXMASTER", m_strlen("MIXMASTER"));
 #endif
     crc = crc32(crc, "USE_POP",   m_strlen("USE_POP"));
     crc = crc32(crc, "MIXMASTER", m_strlen("MIXMASTER"));


@@ -429,7 +427,7 @@ void *mutt_hcache_fetch(hcache_t *db, const char *filename,
                         ssize_t (*keylen)(const char *fn))
 {
     char path[_POSIX_PATH_MAX];
                         ssize_t (*keylen)(const char *fn))
 {
     char path[_POSIX_PATH_MAX];

-    void *data = NULL;
+    char *data = NULL;

 
     if (!db)
         return NULL;
 
     if (!db)
         return NULL;