#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
#include <lib-lib/mem.h>
#include <lib-hash/hash.h>
+#include <lib-lib/debug.h>
#include <lib-mime/mime.h>
#include "mx.h"
#include "lib.h"
-#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;
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;
return;
}
- p_realloc(ptr, siz);
+ p_realloc(p, siz);
}
static unsigned char *dump_int (unsigned int i, 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;
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--;
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"));
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);
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
- int ksize, len;
+ int ksize;
char *data = NULL;
if (!h)
return vlout(h->db, path, ksize);
}
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
void *mutt_hcache_open (const char *path, const char *folder)
{
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)
{