projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a compilation error with gdbm
[apps/madmutt.git]
/
hcache.c
diff --git
a/hcache.c
b/hcache.c
index
af044b9
..
496fd09
100644
(file)
--- a/
hcache.c
+++ b/
hcache.c
@@
-74,7
+74,7
@@
typedef union {
unsigned long uid_validity;
} validate;
unsigned long uid_validity;
} validate;
-static void *lazy_malloc (size_t siz)
+static void *lazy_malloc (s
s
ize_t siz)
{
if (0 < siz && siz < 4096) {
siz = 4096;
{
if (0 < siz && siz < 4096) {
siz = 4096;
@@
-85,13
+85,13
@@
static void *lazy_malloc (size_t siz)
static void lazy_realloc(void *ptr, ssize_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;
}
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)
}
static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
@@
-200,7
+200,7
@@
static void restore_address (address_t ** a, const unsigned char *d, int *off)
*a = NULL;
}
*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;
{
unsigned int counter = 0;
unsigned int start_off = *off;
@@
-218,14
+218,14
@@
static unsigned char *dump_list (LIST * l, unsigned char *d, int *off)
return d;
}
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) {
{
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--;
restore_char (&(*l)->data, d, off);
l = &(*l)->next;
counter--;
@@
-424,7
+424,7
@@
static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
}
static
}
static
-unsigned int crc32 (unsigned int crc, unsigned char const *p, size_t len)
+unsigned int crc32 (unsigned int crc, unsigned char const *p, s
s
ize_t len)
{
int i;
{
int i;
@@
-635,7
+635,7
@@
mutt_hcache_close(void *db)
void *
mutt_hcache_fetch(void *db, const char *filename,
void *
mutt_hcache_fetch(void *db, const char *filename,
- size_t(*keylen) (const char *fn))
+ s
s
ize_t(*keylen) (const char *fn))
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
@@
-664,7
+664,7
@@
mutt_hcache_fetch(void *db, const char *filename,
int
mutt_hcache_store(void *db, const char *filename, HEADER * header,
unsigned long uid_validity,
int
mutt_hcache_store(void *db, const char *filename, HEADER * header,
unsigned long uid_validity,
- size_t(*keylen) (const char *fn))
+ s
s
ize_t(*keylen) (const char *fn))
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
@@
-691,7
+691,7
@@
mutt_hcache_store(void *db, const char *filename, HEADER * header,
int
mutt_hcache_delete(void *db, const char *filename,
int
mutt_hcache_delete(void *db, const char *filename,
- size_t(*keylen) (const char *fn))
+ s
s
ize_t(*keylen) (const char *fn))
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
@@
-712,7
+712,7
@@
mutt_hcache_delete(void *db, const char *filename,
void *mutt_hcache_open (const char *path, const char *folder)
{
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;
int pagesize =
atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384;
h->db = NULL;
@@
-759,7
+759,7
@@
void mutt_hcache_close (void *db)
}
void *mutt_hcache_fetch (void *db, const char *filename,
}
void *mutt_hcache_fetch (void *db, const char *filename,
- size_t (*keylen) (const char *fn))
+ s
s
ize_t (*keylen) (const char *fn))
{
struct header_cache *h = db;
datum key;
{
struct header_cache *h = db;
datum key;
@@
-788,7
+788,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
int
mutt_hcache_store (void *db, const char *filename, HEADER * header,
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, s
s
ize_t (*keylen) (const char *fn))
{
struct header_cache *h = db;
datum key;
{
struct header_cache *h = db;
datum key;
@@
-817,7
+817,7
@@
mutt_hcache_store (void *db, const char *filename, HEADER * header,
int
mutt_hcache_delete (void *db, const char *filename,
int
mutt_hcache_delete (void *db, const char *filename,
- size_t (*keylen) (const char *fn))
+ s
s
ize_t (*keylen) (const char *fn))
{
datum key;
struct header_cache *h = db;
{
datum key;
struct header_cache *h = db;
@@
-837,7
+837,7
@@
mutt_hcache_delete (void *db, const char *filename,
}
#elif defined(HAVE_DB4)
}
#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, s
s
ize_t len)
{
dbt->data = data;
dbt->size = dbt->ulen = len;
{
dbt->data = data;
dbt->size = dbt->ulen = len;
@@
-939,7
+939,7
@@
void mutt_hcache_close (void *db)
}
void *mutt_hcache_fetch (void *db, const char *filename,
}
void *mutt_hcache_fetch (void *db, const char *filename,
- size_t (*keylen) (const char *fn))
+ s
s
ize_t (*keylen) (const char *fn))
{
DBT key;
DBT data;
{
DBT key;
DBT data;
@@
-967,7
+967,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
int
mutt_hcache_store (void *db, const char *filename, HEADER * header,
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, s
s
ize_t (*keylen) (const char *fn))
{
DBT key;
DBT data;
{
DBT key;
DBT data;
@@
-997,7
+997,7
@@
mutt_hcache_store (void *db, const char *filename, HEADER * header,
int
mutt_hcache_delete (void *db, const char *filename,
int
mutt_hcache_delete (void *db, const char *filename,
- size_t (*keylen) (const char *fn))
+ s
s
ize_t (*keylen) (const char *fn))
{
DBT key;
struct header_cache *h = db;
{
DBT key;
struct header_cache *h = db;