X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=f6e0d8ddb2fc3b4270dc6f3814b3b80830cf2c0e;hp=7e7334d928e883ed47b3567a2a67fdf46b1e5424;hb=96d53ff49c308769efbf708e1e65819077cb7af6;hpb=0f73e7417ede147d1a67a8fbed1ba6d2ba9b5297

diff --git a/hcache.c b/hcache.c
index 7e7334d..f6e0d8d 100644
--- a/hcache.c
+++ b/hcache.c
@@ -125,7 +125,7 @@ static unsigned char *dump_char (char *c, unsigned char *d, int *off)
     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);
@@ -177,9 +177,6 @@ static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off)
   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);
@@ -200,9 +197,6 @@ static void restore_address (ADDRESS ** a, const unsigned char *d, int *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);
@@ -453,41 +447,35 @@ static int generate_crc32 ()
 
   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;
 }
@@ -526,7 +514,7 @@ static const char *mutt_hcache_per_folder (const char *path,
   }
 
   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,
@@ -680,9 +668,7 @@ mutt_hcache_fetch(void *db, const char *filename,
 
   if (! crc32_matches(data, h->crc))
   {
-    if (data) { 
-      FREE(&data);
-    }
+    FREE(&data);
     return NULL;
   }
 
@@ -799,7 +785,7 @@ void *mutt_hcache_fetch (void *db, const char *filename,
   }
 
   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);
@@ -807,7 +793,7 @@ void *mutt_hcache_fetch (void *db, const char *filename,
   data = gdbm_fetch (h->db, key);
 
   if (!crc32_matches (data.dptr, h->crc)) {
-    free (data.dptr);
+    FREE(&data.dptr);
     return NULL;
   }
 
@@ -829,7 +815,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
   }
 
   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);
@@ -856,7 +842,7 @@ mutt_hcache_delete (void *db, const char *filename,
   }
 
   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);
@@ -921,7 +907,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
   }
 
   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) {
@@ -938,7 +924,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
     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);
@@ -954,7 +940,6 @@ void *mutt_hcache_open (const char *path, const char *folder)
 void mutt_hcache_close (void *db)
 {
   struct header_cache *h = db;
-  int ret;
 
   if (!h) {
     return;
@@ -987,7 +972,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)) {
-    free (data.data);
+    FREE(&data.data);
     return NULL;
   }