Replace `delete` variable with `delete_header`

`delete` is a reserved keyword in c++

diff --git a/hcache/backend.h b/hcache/backend.h
index 4ba9fcc29e08f0899a9d95bc68a1d1bacb32a734..0c7a14ccbc257f5151a33862c34d9777aff23f8f 100644 (file)
--- a/hcache/backend.h
+++ b/hcache/backend.h
@@ -77,14 +77,14 @@ struct HcacheOps
    */
   int (*store)(void *ctx, const char *key, size_t keylen, void *data, size_t datalen);
   /**
-   * delete - backend-specific routine to delete a message's headers
+   * delete_header - backend-specific routine to delete a message's headers
    * @param ctx    The backend-specific context retrieved via open()
    * @param key    A message identification string
    * @param keylen The length of the string pointed to by key
    * @retval 0   Success
    * @retval num Error, a backend-specific error code
    */
-  int (*delete)(void *ctx, const char *key, size_t keylen);
+  int (*delete_header)(void *ctx, const char *key, size_t keylen);
   /**
    * close - backend-specific routine to close a context
    * @param[out] ctx The backend-specific context retrieved via open()
@@ -108,7 +108,7 @@ struct HcacheOps
     .fetch   = hcache_##_name##_fetch,                                         \
     .free    = hcache_##_name##_free,                                          \
     .store   = hcache_##_name##_store,                                         \
-    .delete  = hcache_##_name##_delete,                                        \
+    .delete_header  = hcache_##_name##_delete_header,                          \
     .close   = hcache_##_name##_close,                                         \
     .backend = hcache_##_name##_backend,                                       \
   };

diff --git a/hcache/bdb.c b/hcache/bdb.c
index d0516345869642e63a7f301db607ddf8b30c5fac..7ee437dfda91ccb85d9f3713626cb5ba7828438e 100644 (file)
--- a/hcache/bdb.c
+++ b/hcache/bdb.c
@@ -204,9 +204,9 @@ static int hcache_bdb_store(void *vctx, const char *key, size_t keylen, void *da
 }
 
 /**
- * hcache_bdb_delete - Implements HcacheOps::delete()
+ * hcache_bdb_delete_header - Implements HcacheOps::delete_header()
  */
-static int hcache_bdb_delete(void *vctx, const char *key, size_t keylen)
+static int hcache_bdb_delete_header(void *vctx, const char *key, size_t keylen)
 {
   if (!vctx)
     return -1;

diff --git a/hcache/gdbm.c b/hcache/gdbm.c
index a25a80acacb7144f6409d5f2c55142042bbc77ee..3120e997418da4948715bc9ffb80ba70296311c5 100644 (file)
--- a/hcache/gdbm.c
+++ b/hcache/gdbm.c
@@ -104,9 +104,9 @@ static int hcache_gdbm_store(void *ctx, const char *key, size_t keylen, void *da
 }
 
 /**
- * hcache_gdbm_delete - Implements HcacheOps::delete()
+ * hcache_gdbm_delete_header - Implements HcacheOps::delete_header()
  */
-static int hcache_gdbm_delete(void *ctx, const char *key, size_t keylen)
+static int hcache_gdbm_delete_header(void *ctx, const char *key, size_t keylen)
 {
   if (!ctx)
     return -1;

diff --git a/hcache/hcache.c b/hcache/hcache.c
index a9465ebaabe0019954f4c2895591cac6b44583cf..a8272a565fcc4b979d2381dc0f98f5fd40e22750 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -444,9 +444,9 @@ int mutt_hcache_store_raw(header_cache_t *hc, const char *key, size_t keylen,
 }
 
 /**
- * mutt_hcache_delete - Multiplexor for HcacheOps::delete
+ * mutt_hcache_delete_header - Multiplexor for HcacheOps::delete_header
  */
-int mutt_hcache_delete(header_cache_t *hc, const char *key, size_t keylen)
+int mutt_hcache_delete_header(header_cache_t *hc, const char *key, size_t keylen)
 {
   char path[PATH_MAX];
   const struct HcacheOps *ops = hcache_get_ops();
@@ -456,7 +456,7 @@ int mutt_hcache_delete(header_cache_t *hc, const char *key, size_t keylen)
 
   keylen = snprintf(path, sizeof(path), "%s%s", hc->folder, key);
 
-  return ops->delete (hc->ctx, path, keylen);
+  return ops->delete_header(hc->ctx, path, keylen);
 }
 
 /**

diff --git a/hcache/hcache.h b/hcache/hcache.h
index 4484a58321f6628b53b01327e5191c861677f7ea..1c23895c4c84216f920cdd22088478dec431545c 100644 (file)
--- a/hcache/hcache.h
+++ b/hcache/hcache.h
@@ -154,14 +154,14 @@ int mutt_hcache_store_raw(header_cache_t *hc, const char *key, size_t keylen,
                           void *data, size_t dlen);
 
 /**
- * mutt_hcache_delete - delete a key / data pair
+ * mutt_hcache_delete_header - delete a key / data pair
  * @param hc     Pointer to the header_cache_t structure got by mutt_hcache_open
  * @param key    Message identification string
  * @param keylen Length of the string pointed to by key
  * @retval 0   Success
  * @retval num Generic or backend-specific error code otherwise
  */
-int mutt_hcache_delete(header_cache_t *hc, const char *key, size_t keylen);
+int mutt_hcache_delete_header(header_cache_t *hc, const char *key, size_t keylen);
 
 /**
  * mutt_hcache_backend_list - get a list of backend identification strings

diff --git a/hcache/kc.c b/hcache/kc.c
index d436e7c47c9f04c392c26ffc0d75d2ba33166f85..c9ab8ae6f19e6bc4a14acb02169c5a14e3397acf 100644 (file)
--- a/hcache/kc.c
+++ b/hcache/kc.c
@@ -110,9 +110,9 @@ static int hcache_kyotocabinet_store(void *ctx, const char *key, size_t keylen,
 }
 
 /**
- * hcache_kyotocabinet_delete - Implements HcacheOps::delete()
+ * hcache_kyotocabinet_delete_header - Implements HcacheOps::delete_header()
  */
-static int hcache_kyotocabinet_delete(void *ctx, const char *key, size_t keylen)
+static int hcache_kyotocabinet_delete_header(void *ctx, const char *key, size_t keylen)
 {
   if (!ctx)
     return -1;

diff --git a/hcache/lmdb.c b/hcache/lmdb.c
index 94b914cd21dc116a8260b19ec46b4d05eb54642f..3c056486b3205eec63fcd400ddffc02ebe2c9b4c 100644 (file)
--- a/hcache/lmdb.c
+++ b/hcache/lmdb.c
@@ -251,9 +251,9 @@ static int hcache_lmdb_store(void *vctx, const char *key, size_t keylen, void *d
 }
 
 /**
- * hcache_lmdb_delete - Implements HcacheOps::delete()
+ * hcache_lmdb_delete_header - Implements HcacheOps::delete_header()
  */
-static int hcache_lmdb_delete(void *vctx, const char *key, size_t keylen)
+static int hcache_lmdb_delete_header(void *vctx, const char *key, size_t keylen)
 {
   if (!vctx)
     return -1;

diff --git a/hcache/qdbm.c b/hcache/qdbm.c
index 872adcb06087ab2edc8f2060e2530279b7dd9fb6..08ecb0162c042d7f59cae68c7e0ae34dc9dbd8c6 100644 (file)
--- a/hcache/qdbm.c
+++ b/hcache/qdbm.c
@@ -87,9 +87,9 @@ static int hcache_qdbm_store(void *ctx, const char *key, size_t keylen, void *da
 }
 
 /**
- * hcache_qdbm_delete - Implements HcacheOps::delete()
+ * hcache_qdbm_delete_header - Implements HcacheOps::delete_header()
  */
-static int hcache_qdbm_delete(void *ctx, const char *key, size_t keylen)
+static int hcache_qdbm_delete_header(void *ctx, const char *key, size_t keylen)
 {
   if (!ctx)
     return -1;

diff --git a/hcache/tc.c b/hcache/tc.c
index 118b419baaada6c36d9fbf4c0266d198d886c2bc..7a265e5590f36e23365bcec71d66e60b63486924 100644 (file)
--- a/hcache/tc.c
+++ b/hcache/tc.c
@@ -99,9 +99,9 @@ static int hcache_tokyocabinet_store(void *ctx, const char *key, size_t keylen,
 }
 
 /**
- * hcache_tokyocabinet_delete - Implements HcacheOps::delete()
+ * hcache_tokyocabinet_delete_header - Implements HcacheOps::delete_header()
  */
-static int hcache_tokyocabinet_delete(void *ctx, const char *key, size_t keylen)
+static int hcache_tokyocabinet_delete_header(void *ctx, const char *key, size_t keylen)
 {
   if (!ctx)
     return -1;

diff --git a/hook.c b/hook.c
index 0223e549a503edd0471189c760da38224542a2e3..ee5692cc3e470d2ba21d03bb96c8b5c1912088dc 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -359,8 +359,8 @@ static void delete_idxfmt_hooks(void)
 /**
  * mutt_parse_idxfmt_hook - Parse the 'index-format-hook' command - Implements ::command_t
  */
-int mutt_parse_idxfmt_hook(struct Buffer *buf, struct Buffer *s,
-                           unsigned long data, struct Buffer *err)
+enum CommandResult mutt_parse_idxfmt_hook(struct Buffer *buf, struct Buffer *s,
+                                          unsigned long data, struct Buffer *err)
 {
   enum CommandResult rc = MUTT_CMD_ERROR;
   bool not = false;

diff --git a/imap/message.c b/imap/message.c
index d840bf4a4af92ac4cd38769f6e24b5808c7759dd..da8835a97d8e6d984d7ca80bf7da2cbb2209d383 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -1398,7 +1398,7 @@ int imap_read_headers(struct Mailbox *m, unsigned int msn_begin,
                             sizeof(mdata->modseq));
     }
     else
-      mutt_hcache_delete(mdata->hcache, "/MODSEQ", 7);
+      mutt_hcache_delete_header(mdata->hcache, "/MODSEQ", 7);
 
     if (has_qresync)
       imap_hcache_store_uid_seqset(mdata);

diff --git a/imap/util.c b/imap/util.c
index 63c776b96a82a5d917c35900ba7114d87174abf1..6366743b742516c4208cb18f4906781cc203cd20 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -513,7 +513,7 @@ int imap_hcache_del(struct ImapMboxData *mdata, unsigned int uid)
   char key[16];
 
   sprintf(key, "/%u", uid);
-  return mutt_hcache_delete(mdata->hcache, key, mutt_str_strlen(key));
+  return mutt_hcache_delete_header(mdata->hcache, key, mutt_str_strlen(key));
 }
 
 /**
@@ -550,7 +550,7 @@ int imap_hcache_clear_uid_seqset(struct ImapMboxData *mdata)
   if (!mdata->hcache)
     return -1;
 
-  return mutt_hcache_delete(mdata->hcache, "/UIDSEQSET", 10);
+  return mutt_hcache_delete_header(mdata->hcache, "/UIDSEQSET", 10);
 }
 
 /**

diff --git a/maildir/shared.c b/maildir/shared.c
index 5fff8fe75811f22cdc15eef7e0ca02e6cd7f163e..b9125044090e83015d9f7dd748fd725fd0215860 100644 (file)
--- a/maildir/shared.c
+++ b/maildir/shared.c
@@ -1433,7 +1433,7 @@ int mh_sync_mailbox_message(struct Mailbox *m, int msgno, header_cache_t *hc)
           key = e->path + 3;
           keylen = maildir_hcache_keylen(key);
         }
-        mutt_hcache_delete(hc, key, keylen);
+        mutt_hcache_delete_header(hc, key, keylen);
       }
 #endif
       unlink(path);

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 28df0bae8363523c7d0ac339ea7be31f3301d94f..2c8b309e14477e348736a0dd3d9d235f5a130ee6 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -747,8 +747,8 @@ void nntp_hcache_update(struct NntpMboxData *mdata, header_cache_t *hc)
           continue;
 
         snprintf(buf, sizeof(buf), "%u", current);
-        mutt_debug(LL_DEBUG2, "mutt_hcache_delete %s\n", buf);
-        mutt_hcache_delete(hc, buf, strlen(buf));
+        mutt_debug(LL_DEBUG2, "mutt_hcache_delete_header %s\n", buf);
+        mutt_hcache_delete_header(hc, buf, strlen(buf));
       }
     }
     mutt_hcache_free(hc, &hdata);

diff --git a/nntp/nntp.c b/nntp/nntp.c
index ffde86a16afc3590e0b3398079e43228c9aafa0a..f5ccd1017a1292f982723b4f0f7ca170bd437368 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -1307,8 +1307,8 @@ static int nntp_fetch_headers(struct Mailbox *m, void *hc, anum_t first, anum_t
 #ifdef USE_HCACHE
         if (fc.hc)
         {
-          mutt_debug(LL_DEBUG2, "mutt_hcache_delete %s\n", buf);
-          mutt_hcache_delete(fc.hc, buf, strlen(buf));
+          mutt_debug(LL_DEBUG2, "mutt_hcache_delete_header %s\n", buf);
+          mutt_hcache_delete_header(fc.hc, buf, strlen(buf));
         }
 #endif
       }

diff --git a/pop/pop.c b/pop/pop.c
index cfd28abcd5f87da4463ef1ec776e0c9e23d16dd6..51c4c21328630d85040591c59d6cfd784040dc1e 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -979,7 +979,7 @@ static int pop_mbox_sync(struct Mailbox *m, int *index_hint)
         {
           mutt_bcache_del(adata->bcache, cache_id(edata->uid));
 #ifdef USE_HCACHE
-          mutt_hcache_delete(hc, edata->uid, strlen(edata->uid));
+          mutt_hcache_delete_header(hc, edata->uid, strlen(edata->uid));
 #endif
         }
       }