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

diff --git a/hcache.c b/hcache.c
index b479dc2..e089bf1 100644
--- a/hcache.c
+++ b/hcache.c
@@ -16,27 +16,27 @@
 
 #define MUTTNG_HCACHE_ID        "0x004"
 
-# if HAVE_INTTYPES_H
+# ifdef HAVE_INTTYPES_H
 #  include <inttypes.h>
 # else
-#  if HAVE_STDINT_H
+#  ifdef HAVE_STDINT_H
 #   include <stdint.h>
 #  endif
 # endif
 
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
 #include <depot.h>
 #include <cabin.h>
 #include <villa.h>
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
 #include <gdbm.h>
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
 #include <db.h>
 #endif
 
 #include <errno.h>
 #include <fcntl.h>
-#if HAVE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 
@@ -52,30 +52,23 @@
 
 #include "lib/debug.h"
 
-#if HAVE_QDBM
-static struct
-  header_cache {
+static struct header_cache {
+#if defined(HAVE_QDBM)
   VILLA *db;
   char *folder;
   unsigned int crc;
-} HEADER_CACHE;
-#elif HAVE_GDBM
-static struct
-  header_cache {
+#elif defined(HAVE_GDBM)
   GDBM_FILE db;
   char *folder;
   unsigned int crc;
-} HEADER_CACHE;
-#elif HAVE_DB4
-static struct
-  header_cache {
+#elif defined(HAVE_DB4)
   DB_ENV *env;
   DB *db;
   unsigned int crc;
   int fd;
   char lockfile[_POSIX_PATH_MAX];
-} HEADER_CACHE;
 #endif
+} HEADER_CACHE;
 
 typedef union {
   struct timeval timeval;
@@ -91,7 +84,7 @@ static void *lazy_malloc (size_t siz)
   return xmalloc(siz);
 }
 
-static void lazy_realloc (void *ptr, size_t siz)
+static void lazy_realloc(void *ptr, ssize_t siz)
 {
   void **p = (void **) ptr;
 
@@ -99,7 +92,7 @@ static void lazy_realloc (void *ptr, size_t siz)
     return;
   }
 
-  p_realloc(ptr, siz);
+  p_realloc(p, siz);
 }
 
 static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
@@ -453,7 +446,7 @@ static int generate_crc32 ()
                m_strlen
                (MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
 
-#if HAVE_LANGINFO_CODESET
+#ifdef HAVE_LANGINFO_CODESET
   crc = crc32(crc, (unsigned char const *) Charset, m_strlen(Charset));
   crc = crc32(crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
               m_strlen("HAVE_LANGINFO_CODESET"));
@@ -594,11 +587,11 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
   return h;
 }
 
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
 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    flags = VL_OWRITER | VL_OCREAT;
   h->db = NULL;
   h->folder = m_strdup(folder);
@@ -647,7 +640,7 @@ mutt_hcache_fetch(void *db, const char *filename,
 {
   struct header_cache *h = db;
   char path[_POSIX_PATH_MAX];
-  int ksize, len;
+  int ksize;
   char *data = NULL;
 
   if (!h)
@@ -716,7 +709,7 @@ mutt_hcache_delete(void *db, const char *filename,
   return vlout(h->db, path, ksize);
 }
 
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
 
 void *mutt_hcache_open (const char *path, const char *folder)
 {
@@ -843,7 +836,7 @@ mutt_hcache_delete (void *db, const char *filename,
 
   return gdbm_delete (h->db, key);
 }
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
 
 static void mutt_hcache_dbt_init (DBT * dbt, void *data, size_t len)
 {