#include "lib.h"
#include "md5.h"
-#include "lib/mem.h"
#include "lib/debug.h"
#if HAVE_QDBM
return;
}
- mem_realloc (ptr, siz);
+ p_realloc(ptr, siz);
}
static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
return d;
}
- size = str_len (c) + 1;
+ size = m_strlen(c) + 1;
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
crc = crc32 (crc, (unsigned char const *)
MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
- str_len
+ m_strlen
(MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
#if HAVE_LANGINFO_CODESET
- crc = crc32 (crc, (unsigned char const *) Charset, str_len (Charset));
+ crc = crc32 (crc, (unsigned char const *) Charset, m_strlen(Charset));
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
- str_len ("HAVE_LANGINFO_CODESET"));
+ m_strlen("HAVE_LANGINFO_CODESET"));
#endif
#ifdef USE_POP
crc =
- crc32 (crc, (unsigned char const *) "USE_POP", str_len ("USE_POP"));
+ crc32 (crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
- str_len ("MIXMASTER"));
+ m_strlen("MIXMASTER"));
#endif
#ifdef USE_IMAP
crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP", str_len ("USE_IMAP"));
+ crc32 (crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
#endif
#ifdef USE_NNTP
crc =
- crc32 (crc, (unsigned char const *) "USE_NNTP", str_len ("USE_NNTP"));
+ crc32 (crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
#endif
return crc;
}
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder, str_len (folder));
+ MD5Update (&md5, (unsigned char *) folder, m_strlen(folder));
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
/* this is needed for maildir style mailboxes */
if (oh) {
h->old = (*oh)->old;
- h->path = str_dup ((*oh)->path);
+ h->path = m_strdup((*oh)->path);
mutt_free_header (oh);
}
void *
mutt_hcache_open(const char *path, const char *folder)
{
- struct header_cache *h = mem_calloc(1, sizeof (HEADER_CACHE));
+ struct header_cache *h = p_new(HEADER_CACHE, 1);
int flags = VL_OWRITER | VL_OCREAT;
h->db = NULL;
- h->folder = str_dup(folder);
+ h->folder = m_strdup(folder);
h->crc = generate_crc32();
if (!path || path[0] == '\0')
void *mutt_hcache_open (const char *path, const char *folder)
{
- struct header_cache *h = mem_calloc (1, sizeof (HEADER_CACHE));
+ struct header_cache *h = p_new(HEADER_CACHE, 1);
int pagesize =
atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384;
h->db = NULL;
- h->folder = str_dup (folder);
+ h->folder = m_strdup(folder);
h->crc = generate_crc32 ();
if (!path || path[0] == '\0') {
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - str_len (path));
+ strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;
key.dsize = keylen (path);
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - str_len (path));
+ strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;
key.dsize = keylen (path);
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - str_len (path));
+ strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;
key.dsize = keylen (path);