return d;
}
- size = safe_strlen (c) + 1;
+ size = mutt_strlen (c) + 1;
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
d = dump_int (0xdeadbeef, d, off);
while (a) {
-#ifdef EXACT_ADDRESS
- d = dump_char (a->val, d, off);
-#endif
d = dump_char (a->personal, d, off);
d = dump_char (a->mailbox, d, off);
d = dump_int (a->group, d, off);
while (counter) {
*a = safe_malloc (sizeof (ADDRESS));
-#ifdef EXACT_ADDRESS
- restore_char (&(*a)->val, d, off);
-#endif
restore_char (&(*a)->personal, d, off);
restore_char (&(*a)->mailbox, d, off);
restore_int ((unsigned int *) &(*a)->group, d, off);
crc = crc32 (crc, (unsigned char const *)
"sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
- safe_strlen
+ mutt_strlen
("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
#if HAVE_LANGINFO_CODESET
- crc = crc32 (crc, (unsigned char const *) Charset, safe_strlen (Charset));
+ crc = crc32 (crc, (unsigned char const *) Charset, mutt_strlen (Charset));
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
- safe_strlen ("HAVE_LANGINFO_CODESET"));
-#endif
-
-#if EXACT_ADDRESS
- crc =
- crc32 (crc, (unsigned char const *) "EXACT_ADDRESS",
- safe_strlen ("EXACT_ADDRESS"));
+ mutt_strlen ("HAVE_LANGINFO_CODESET"));
#endif
#ifdef USE_POP
crc =
- crc32 (crc, (unsigned char const *) "USE_POP", safe_strlen ("USE_POP"));
+ crc32 (crc, (unsigned char const *) "USE_POP", mutt_strlen ("USE_POP"));
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
- safe_strlen ("MIXMASTER"));
+ mutt_strlen ("MIXMASTER"));
#endif
#ifdef USE_IMAP
crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP", safe_strlen ("USE_IMAP"));
+ crc32 (crc, (unsigned char const *) "USE_IMAP", mutt_strlen ("USE_IMAP"));
#endif
#ifdef USE_NNTP
crc =
- crc32 (crc, (unsigned char const *) "USE_NNTP", safe_strlen ("USE_NNTP"));
+ crc32 (crc, (unsigned char const *) "USE_NNTP", mutt_strlen ("USE_NNTP"));
#endif
return crc;
}
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder, safe_strlen (folder));
+ MD5Update (&md5, (unsigned char *) folder, mutt_strlen (folder));
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
mutt_hcache_open(const char *path, const char *folder)
{
struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
- int flags = 0;
-#if 0 /* FIXME */
- int pagesize = atoi(HeaderCachePageSize) ? atoi(HeaderCachePageSize) : 16384;
-#endif
+ int flags = VL_OWRITER | VL_OCREAT;
h->db = NULL;
h->folder = safe_strdup(folder);
h->crc = generate_crc32();
path = mutt_hcache_per_folder(path, folder);
if (option(OPTHCACHECOMPRESS))
- flags = VL_OZCOMP;
+ flags |= VL_OZCOMP;
- h->db = vlopen(path, flags | VL_OWRITER | VL_OCREAT, VL_CMPLEX);
- if (h->db)
- return h;
-
- /* if rw failed try ro */
- h->db = vlopen(path, flags | VL_OREADER, VL_CMPLEX);
+ h->db = vlopen(path, flags, VL_CMPLEX);
if (h->db)
return h;
else
if (! crc32_matches(data, h->crc))
{
- if (data) {
- FREE(&data);
- }
+ FREE(&data);
return NULL;
}
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ strncat (path, filename, sizeof (path) - mutt_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
data = gdbm_fetch (h->db, key);
if (!crc32_matches (data.dptr, h->crc)) {
- free (data.dptr);
+ FREE(&data.dptr);
return NULL;
}
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ strncat (path, filename, sizeof (path) - mutt_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ strncat (path, filename, sizeof (path) - mutt_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
}
ret =
- h->env->open (h->env, NULL, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0600);
+ (h->env->open)(h->env, NULL, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0600);
if (!ret) {
ret = db_create (&h->db, h->env, 0);
if (ret) {
h->db->set_pagesize (h->db, pagesize);
}
- ret = h->db->open (h->db, NULL, path, folder, DB_BTREE, createflags, 0600);
+ ret = (h->db->open)(h->db, NULL, path, folder, DB_BTREE, createflags, 0600);
if (ret) {
h->db->close (h->db, 0);
h->env->close (h->env, 0);
void mutt_hcache_close (void *db)
{
struct header_cache *h = db;
- int ret;
if (!h) {
return;
h->db->get (h->db, NULL, &key, &data, 0);
if (!crc32_matches (data.data, h->crc)) {
- free (data.data);
+ FREE(&data.data);
return NULL;
}