Changeset 5111:c38765da3fe8

Timestamp:

2007-04-10 15:32:08 (21 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Add imap_hcache_del; minor cleanups

Location:

imap

Files:

• command.c (modified) (1 diff)
• imap.c (modified) (4 diffs)
• imap_private.h (modified) (1 diff)
• util.c (modified) (2 diffs)

imap/command.c

@@ -31 +31 @@
 #include "mx.h"
 #include "buffy.h"
-#if USE_HCACHE
-#include "hcache.h"
-#endif
 
 #include <ctype.h>

imap/imap.c

@@ -249 +249 @@
   int i, cacheno;
 
-#if USE_HCACHE
-  char uidbuf[32];
-#endif
-
   for (i = 0; i < idata->ctx->msgcount; i++)
   {
@@ -266 +262 @@
       imap_cache_del (idata, h);
 #if USE_HCACHE
-      if (idata->hcache)
-      {
-        sprintf (uidbuf, "/%u", HEADER_DATA(h)->uid);
-        mutt_hcache_delete (idata->hcache, uidbuf, imap_hcache_keylen);
-      }
+      imap_hcache_del (idata, HEADER_DATA(h)->uid);
 #endif
 
@@ -1104 +1096 @@
   int n;
   int rc;
-#if USE_HCACHE
-  char uidbuf[32];
-#endif
   
   idata = (IMAP_DATA*) ctx->data;
@@ -1157 +1146 @@
 
     if (h->deleted)
+    {
       imap_cache_del (idata, h);
 #if USE_HCACHE
-    if (idata->hcache && h->deleted)
-    {
-      sprintf (uidbuf, "/%u", HEADER_DATA(h)->uid);
-      mutt_hcache_delete (idata->hcache, uidbuf, imap_hcache_keylen);
-    }
+      imap_hcache_del (idata, HEADER_DATA(h)->uid);
 #endif
+    }
+    
     if (h->active && h->changed)
     {

imap/imap_private.h

@@ -263 +263 @@
 HEADER* imap_hcache_get (IMAP_DATA* idata, unsigned int uid);
 int imap_hcache_put (IMAP_DATA* idata, HEADER* h);
+int imap_hcache_del (IMAP_DATA* idata, unsigned int uid);
 #endif
 

imap/util.c

@@ -95 +95 @@
   HEADER* h = NULL;
 
-  sprintf(key, "/%u", uid);
+  if (!idata->hcache)
+    return NULL;
+
+  sprintf (key, "/%u", uid);
   uv = (unsigned int*)mutt_hcache_fetch (idata->hcache, key,
                                          imap_hcache_keylen);
@@ -112 +115 @@
   char key[16];
 
-  sprintf(key, "/%u", HEADER_DATA (h)->uid);
+  if (!idata->hcache)
+    return -1;
+
+  sprintf (key, "/%u", HEADER_DATA (h)->uid);
   return mutt_hcache_store (idata->hcache, key, h, idata->uid_validity,
                             imap_hcache_keylen);
+}
+
+int imap_hcache_del (IMAP_DATA* idata, unsigned int uid)
+{
+  char key[16];
+
+  if (!idata->hcache)
+    return -1;
+
+  sprintf (key, "/%u", uid);
+  return mutt_hcache_delete (idata->hcache, key, imap_hcache_keylen);
 }
 #endif