Changeset 5074:d10bc7f74089 for imap/message.c

Timestamp:

2007-04-05 18:03:05 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

IMAP header cache API improvements.

Files:

• imap/message.c (modified) (4 diffs)

imap/message.c

@@ -79 +79 @@
   unsigned int *uidnext = NULL;
   int evalhc = 0;
-  char uid_buf[64];
 #endif /* USE_HCACHE */
 
@@ -169 +168 @@
 
         idx = h.sid - 1;
-        sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
-        uid_validity = (unsigned int*)mutt_hcache_fetch (idata->hcache, uid_buf, &imap_hcache_keylen);
-
-        if (uid_validity != NULL && *uid_validity == idata->uid_validity)
+        ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
+        if (ctx->hdrs[idx])
         {
-          ctx->hdrs[idx] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
           ctx->hdrs[idx]->index = idx;
           /* messages which have not been expunged are ACTIVE (borrowed from mh 
@@ -195 +191 @@
            * TODO: consider the possibility of a holey cache. */
           imap_free_header_data((void**) &h.data);
-  
-        FREE(&uid_validity);
       }
       while (rc != IMAP_CMD_OK && mfhrc == -1);
@@ -294 +288 @@
 
 #if USE_HCACHE
-      sprintf(uid_buf, "/%u", h.data->uid);
-      mutt_hcache_store(idata->hcache, uid_buf, ctx->hdrs[idx], idata->uid_validity, &imap_hcache_keylen);
+      imap_hcache_put (idata, ctx->hdrs[idx]);
 #endif /* USE_HCACHE */