X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=140df180c6b746ebeed019b631cd272dfd6c532e;hp=e69a591699f27b0d0ffba9ea1f5b985d21f2bb5c;hb=83532821ae9fab034d0d630b78330c9ea4ff4cf3;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c diff --git a/hcache.c b/hcache.c index e69a591..140df18 100644 --- a/hcache.c +++ b/hcache.c @@ -41,17 +41,17 @@ #endif #include +#include + +#include #include "mutt.h" #ifdef USE_IMAP #include "message.h" #endif -#include "mime.h" #include "mx.h" #include "lib.h" -#include "md5.h" -#include "lib/mem.h" #include "lib/debug.h" #if HAVE_QDBM @@ -101,7 +101,7 @@ static void lazy_realloc (void *ptr, size_t siz) return; } - mem_realloc (ptr, siz); + p_realloc(ptr, siz); } static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off) @@ -129,7 +129,7 @@ static unsigned char *dump_char (char *c, 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); @@ -172,7 +172,7 @@ static void restore_char (char **c, const unsigned char *d, int *off) *off += size; } -static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off) +static unsigned char *dump_address (address_t * a, unsigned char *d, int *off) { unsigned int counter = 0; unsigned int start_off = *off; @@ -192,14 +192,14 @@ static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off) return d; } -static void restore_address (ADDRESS ** a, const unsigned char *d, int *off) +static void restore_address (address_t ** a, const unsigned char *d, int *off) { unsigned int counter; restore_int (&counter, d, off); while (counter) { - *a = p_new(ADDRESS, 1); + *a = p_new(address_t, 1); restore_char (&(*a)->personal, d, off); restore_char (&(*a)->mailbox, d, off); restore_int ((unsigned int *) &(*a)->group, d, off); @@ -452,35 +452,35 @@ static int generate_crc32 () 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; } @@ -519,7 +519,7 @@ static const char *mutt_hcache_per_folder (const char *path, } 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, @@ -598,7 +598,7 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh) /* 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); } @@ -612,7 +612,7 @@ mutt_hcache_open(const char *path, const char *folder) 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') @@ -658,20 +658,20 @@ mutt_hcache_fetch(void *db, const char *filename, { struct header_cache *h = db; char path[_POSIX_PATH_MAX]; - int ksize; + int ksize, len; char *data = NULL; if (!h) return NULL; - strncpy(path, h->folder, sizeof (path)); - str_cat(path, sizeof (path), filename); + m_strcpy(path, sizeof(path), h->folder); + m_strcat(path, sizeof(path), filename); ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); data = vlget(h->db, path, ksize, NULL); - if (! crc32_matches(data, h->crc)) + if (!crc32_matches(data, h->crc)) { p_delete(&data); return NULL; @@ -694,8 +694,8 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header, if (!h) return -1; - strncpy(path, h->folder, sizeof (path)); - str_cat(path, sizeof (path), filename); + m_strcpy(path, sizeof(path), h->folder); + m_strcat(path, sizeof(path), filename); ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); @@ -719,8 +719,8 @@ mutt_hcache_delete(void *db, const char *filename, if (!h) return -1; - strncpy(path, h->folder, sizeof (path)); - str_cat(path, sizeof (path), filename); + m_strcpy(path, sizeof(path), h->folder); + m_strcat(path, sizeof(path), filename); ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); @@ -735,7 +735,7 @@ void *mutt_hcache_open (const char *path, const char *folder) 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') { @@ -789,8 +789,8 @@ void *mutt_hcache_fetch (void *db, const char *filename, return NULL; } - strncpy (path, h->folder, sizeof (path)); - strncat (path, filename, sizeof (path) - str_len (path)); + m_strcpy(path, sizeof(path), h->folder); + strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; key.dsize = keylen (path); @@ -819,8 +819,8 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, return -1; } - strncpy (path, h->folder, sizeof (path)); - strncat (path, filename, sizeof (path) - str_len (path)); + m_strcpy(path, sizeof(path), h->folder); + strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; key.dsize = keylen (path); @@ -846,8 +846,8 @@ mutt_hcache_delete (void *db, const char *filename, return -1; } - strncpy (path, h->folder, sizeof (path)); - strncat (path, filename, sizeof (path) - str_len (path)); + m_strcpy(path, sizeof(path), h->folder); + strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; key.dsize = keylen (path);