X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=e513c76b478f3b540e407e3dbbb408d201589dae;hp=0febef6c0ae4c96aa92ac03fe634a00cba4d6005;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hpb=23265c6d12ecb744cb38689e9d78a448089ac351

diff --git a/hcache.c b/hcache.c
index 0febef6..e513c76 100644
--- a/hcache.c
+++ b/hcache.c
@@ -39,6 +39,10 @@
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+
+#include <lib-lib/mem.h>
+#include <lib-hash/hash.h>
+
 #include "mutt.h"
 #ifdef USE_IMAP
 #include "message.h"
@@ -46,9 +50,7 @@
 #include "mime.h"
 #include "mx.h"
 #include "lib.h"
-#include "md5.h"
 
-#include "lib/mem.h"
 #include "lib/debug.h"
 
 #if HAVE_QDBM
@@ -87,7 +89,7 @@ static void *lazy_malloc (size_t siz)
     siz = 4096;
   }
 
-  return mem_malloc (siz);
+  return xmalloc(siz);
 }
 
 static void lazy_realloc (void *ptr, size_t siz)
@@ -98,7 +100,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)
@@ -126,7 +128,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);
@@ -165,8 +167,7 @@ static void restore_char (char **c, const unsigned char *d, int *off)
     return;
   }
 
-  *c = mem_malloc (size);
-  memcpy (*c, d + *off, size);
+  *c = p_dup(d + *off, size);
   *off += size;
 }
 
@@ -197,7 +198,7 @@ static void restore_address (ADDRESS ** a, const unsigned char *d, int *off)
   restore_int (&counter, d, off);
 
   while (counter) {
-    *a = mem_malloc (sizeof (ADDRESS));
+    *a = p_new(ADDRESS, 1);
     restore_char (&(*a)->personal, d, off);
     restore_char (&(*a)->mailbox, d, off);
     restore_int ((unsigned int *) &(*a)->group, d, off);
@@ -233,7 +234,7 @@ static void restore_list (LIST ** l, const unsigned char *d, int *off)
   restore_int (&counter, d, off);
 
   while (counter) {
-    *l = mem_malloc (sizeof (LIST));
+    *l = p_new(LIST, 1);
     restore_char (&(*l)->data, d, off);
     l = &(*l)->next;
     counter--;
@@ -271,7 +272,7 @@ static void restore_buffer (BUFFER ** b, const unsigned char *d, int *off)
     return;
   }
 
-  *b = mem_malloc (sizeof (BUFFER));
+  *b = p_new(BUFFER, 1);
 
   restore_char (&(*b)->data, d, off);
   restore_int (&offset, d, off);
@@ -309,7 +310,7 @@ restore_parameter (PARAMETER ** p, const unsigned char *d, int *off)
   restore_int (&counter, d, off);
 
   while (counter) {
-    *p = mem_malloc (sizeof (PARAMETER));
+    *p = p_new(PARAMETER, 1);
     restore_char (&(*p)->attribute, d, off);
     restore_char (&(*p)->value, d, off);
     p = &(*p)->next;
@@ -450,35 +451,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;
 }
@@ -517,7 +518,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,
@@ -596,7 +597,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);
   }
 
@@ -607,16 +608,16 @@ HEADER *mutt_hcache_restore (const unsigned char *d, 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')
   {
-    mem_free(&h->folder);
-    mem_free(&h);
+    p_delete(&h->folder);
+    p_delete(&h);
     return NULL;
   }
 
@@ -630,8 +631,8 @@ mutt_hcache_open(const char *path, const char *folder)
     return h;
   else
   {
-    mem_free(&h->folder);
-    mem_free(&h);
+    p_delete(&h->folder);
+    p_delete(&h);
 
     return NULL;
   }
@@ -646,8 +647,8 @@ mutt_hcache_close(void *db)
     return;
 
   vlclose(h->db);
-  mem_free(&h->folder);
-  mem_free(&h);
+  p_delete(&h->folder);
+  p_delete(&h);
 }
 
 void *
@@ -662,7 +663,7 @@ mutt_hcache_fetch(void *db, const char *filename,
   if (!h)
     return NULL;
 
-  strncpy(path, h->folder, sizeof (path));
+  m_strcpy(path, sizeof(path), h->folder);
   str_cat(path, sizeof (path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@ -671,7 +672,7 @@ mutt_hcache_fetch(void *db, const char *filename,
 
   if (! crc32_matches(data, h->crc))
   {
-    mem_free(&data);
+    p_delete(&data);
     return NULL;
   }
 
@@ -692,7 +693,7 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header,
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
+  m_strcpy(path, sizeof(path), h->folder);
   str_cat(path, sizeof (path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@ -701,7 +702,7 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header,
 
   ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER);
 
-  mem_free(&data);
+  p_delete(&data);
 
   return ret;
 }
@@ -717,7 +718,7 @@ mutt_hcache_delete(void *db, const char *filename,
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
+  m_strcpy(path, sizeof(path), h->folder);
   str_cat(path, sizeof (path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@ -729,16 +730,16 @@ mutt_hcache_delete(void *db, const char *filename,
 
 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') {
-    mem_free (&h->folder);
-    mem_free (&h);
+    p_delete(&h->folder);
+    p_delete(&h);
     return NULL;
   }
 
@@ -755,8 +756,8 @@ void *mutt_hcache_open (const char *path, const char *folder)
     return h;
   }
   else {
-    mem_free (&h->folder);
-    mem_free (&h);
+    p_delete(&h->folder);
+    p_delete(&h);
 
     return NULL;
   }
@@ -771,8 +772,8 @@ void mutt_hcache_close (void *db)
   }
 
   gdbm_close (h->db);
-  mem_free (&h->folder);
-  mem_free (&h);
+  p_delete(&h->folder);
+  p_delete(&h);
 }
 
 void *mutt_hcache_fetch (void *db, const char *filename,
@@ -787,8 +788,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);
@@ -796,7 +797,7 @@ void *mutt_hcache_fetch (void *db, const char *filename,
   data = gdbm_fetch (h->db, key);
 
   if (!crc32_matches (data.dptr, h->crc)) {
-    mem_free(&data.dptr);
+    p_delete(&data.dptr);
     return NULL;
   }
 
@@ -817,8 +818,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);
@@ -827,7 +828,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
 
   ret = gdbm_store (h->db, key, data, GDBM_REPLACE);
 
-  mem_free (&data.dptr);
+  p_delete(&data.dptr);
 
   return ret;
 }
@@ -844,8 +845,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);
@@ -881,7 +882,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
   h->crc = generate_crc32 ();
 
   if (!path || path[0] == '\0') {
-    mem_free (&h);
+    p_delete(&h);
     return NULL;
   }
 
@@ -891,13 +892,13 @@ void *mutt_hcache_open (const char *path, const char *folder)
 
   h->fd = open (h->lockfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
   if (h->fd < 0) {
-    mem_free (&h);
+    p_delete(&h);
     return NULL;
   }
 
   if (mx_lock_file (h->lockfile, h->fd, 1, 0, 5)) {
     close (h->fd);
-    mem_free (&h);
+    p_delete(&h);
     return NULL;
   }
 
@@ -905,7 +906,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
   if (ret) {
     mx_unlock_file (h->lockfile, h->fd, 0);
     close (h->fd);
-    mem_free (&h);
+    p_delete(&h);
     return NULL;
   }
 
@@ -917,7 +918,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
       h->env->close (h->env, 0);
       mx_unlock_file (h->lockfile, h->fd, 0);
       close (h->fd);
-      mem_free (&h);
+      p_delete(&h);
       return NULL;
     }
   }
@@ -933,7 +934,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
     h->env->close (h->env, 0);
     mx_unlock_file (h->lockfile, h->fd, 0);
     close (h->fd);
-    mem_free (&h);
+    p_delete(&h);
     return NULL;
   }
 
@@ -952,7 +953,7 @@ void mutt_hcache_close (void *db)
   h->env->close (h->env, 0);
   mx_unlock_file (h->lockfile, h->fd, 0);
   close (h->fd);
-  mem_free (&h);
+  p_delete(&h);
 }
 
 void *mutt_hcache_fetch (void *db, const char *filename,
@@ -975,7 +976,7 @@ void *mutt_hcache_fetch (void *db, const char *filename,
   h->db->get (h->db, NULL, &key, &data, 0);
 
   if (!crc32_matches (data.data, h->crc)) {
-    mem_free(&data.data);
+    p_delete(&data.data);
     return NULL;
   }
 
@@ -1007,7 +1008,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
 
   ret = h->db->put (h->db, NULL, &key, &data, 0);
 
-  mem_free (&data.data);
+  p_delete(&data.data);
 
   return ret;
 }