hcache: unify naming in free()

Ensure all the hcache backends clean up in the same way.

diff --git a/hcache/bdb.c b/hcache/bdb.c
index 87252025887f922be2dba2b6780547b5e15ac500..d9e7bcc61ca630793ce3118b1bcd388656d3dd3c 100644 (file)
--- a/hcache/bdb.c
+++ b/hcache/bdb.c
@@ -222,19 +222,19 @@ static int hcache_bdb_delete_header(void *vctx, const char *key, size_t keylen)
 /**
  * hcache_bdb_close - Implements HcacheOps::close()
  */
-static void hcache_bdb_close(void **vctx)
+static void hcache_bdb_close(void **ptr)
 {
-  if (!vctx || !*vctx)
+  if (!ptr || !*ptr)
     return;
 
-  struct HcacheDbCtx *ctx = *vctx;
+  struct HcacheDbCtx *db = *ptr;
 
-  ctx->db->close(ctx->db, 0);
-  ctx->env->close(ctx->env, 0);
-  mutt_file_unlock(ctx->fd);
-  close(ctx->fd);
-  unlink(ctx->lockfile);
-  FREE(vctx);
+  db->db->close(db->db, 0);
+  db->env->close(db->env, 0);
+  mutt_file_unlock(db->fd);
+  close(db->fd);
+  unlink(db->lockfile);
+  FREE(ptr);
 }
 
 /**

diff --git a/hcache/gdbm.c b/hcache/gdbm.c
index 32acd6584a96822bab0622f5d842bc7a9f9adea7..017f7723b392cb0a6ffe02f3880aaf1077c864da 100644 (file)
--- a/hcache/gdbm.c
+++ b/hcache/gdbm.c
@@ -123,13 +123,14 @@ static int hcache_gdbm_delete_header(void *ctx, const char *key, size_t keylen)
 /**
  * hcache_gdbm_close - Implements HcacheOps::close()
  */
-static void hcache_gdbm_close(void **ctx)
+static void hcache_gdbm_close(void **ptr)
 {
-  if (!ctx)
+  if (!ptr || !*ptr)
     return;
 
-  GDBM_FILE db = *ctx;
+  GDBM_FILE db = *ptr;
   gdbm_close(db);
+  *ptr = NULL;
 }
 
 /**

diff --git a/hcache/kc.c b/hcache/kc.c
index c9ab8ae6f19e6bc4a14acb02169c5a14e3397acf..e01381553978c6db66c8d0bc43dc619e7a320a3c 100644 (file)
--- a/hcache/kc.c
+++ b/hcache/kc.c
@@ -129,18 +129,19 @@ static int hcache_kyotocabinet_delete_header(void *ctx, const char *key, size_t
 /**
  * hcache_kyotocabinet_close - Implements HcacheOps::close()
  */
-static void hcache_kyotocabinet_close(void **ctx)
+static void hcache_kyotocabinet_close(void **ptr)
 {
-  if (!ctx || !*ctx)
+  if (!ptr || !*ptr)
     return;
 
-  KCDB *db = *ctx;
+  KCDB *db = *ptr;
   if (!kcdbclose(db))
   {
     int ecode = kcdbecode(db);
     mutt_debug(LL_DEBUG2, "kcdbclose failed: %s (ecode %d)\n", kcdbemsg(db), ecode);
   }
   kcdbdel(db);
+  *ptr = NULL;
 }
 
 /**

diff --git a/hcache/lmdb.c b/hcache/lmdb.c
index 3c056486b3205eec63fcd400ddffc02ebe2c9b4c..f23a6322d5c0987ddcd1c1f7d3701a8a899f79f7 100644 (file)
--- a/hcache/lmdb.c
+++ b/hcache/lmdb.c
@@ -285,22 +285,22 @@ static int hcache_lmdb_delete_header(void *vctx, const char *key, size_t keylen)
 /**
  * hcache_lmdb_close - Implements HcacheOps::close()
  */
-static void hcache_lmdb_close(void **vctx)
+static void hcache_lmdb_close(void **ptr)
 {
-  if (!vctx || !*vctx)
+  if (!ptr || !*ptr)
     return;
 
-  struct HcacheLmdbCtx *ctx = *vctx;
+  struct HcacheLmdbCtx *db = *ptr;
 
-  if (ctx->txn && (ctx->txn_mode == TXN_WRITE))
+  if (db->txn && (db->txn_mode == TXN_WRITE))
   {
-    mdb_txn_commit(ctx->txn);
-    ctx->txn_mode = TXN_UNINITIALIZED;
-    ctx->txn = NULL;
+    mdb_txn_commit(db->txn);
+    db->txn_mode = TXN_UNINITIALIZED;
+    db->txn = NULL;
   }
 
-  mdb_env_close(ctx->env);
-  FREE(vctx);
+  mdb_env_close(db->env);
+  FREE(ptr);
 }
 
 /**

diff --git a/hcache/qdbm.c b/hcache/qdbm.c
index 08ecb0162c042d7f59cae68c7e0ae34dc9dbd8c6..848f8c2ed70561d9b6a1064ad2333241cbe8d996 100644 (file)
--- a/hcache/qdbm.c
+++ b/hcache/qdbm.c
@@ -104,13 +104,14 @@ static int hcache_qdbm_delete_header(void *ctx, const char *key, size_t keylen)
 /**
  * hcache_qdbm_close - Implements HcacheOps::close()
  */
-static void hcache_qdbm_close(void **ctx)
+static void hcache_qdbm_close(void **ptr)
 {
-  if (!ctx || !*ctx)
+  if (!ptr || !*ptr)
     return;
 
-  VILLA *db = *ctx;
+  VILLA *db = *ptr;
   vlclose(db);
+  *ptr = NULL;
 }
 
 /**

diff --git a/hcache/tc.c b/hcache/tc.c
index 7a265e5590f36e23365bcec71d66e60b63486924..8dd6267eb521390043f6452ff234389a8b422cd6 100644 (file)
--- a/hcache/tc.c
+++ b/hcache/tc.c
@@ -118,18 +118,19 @@ static int hcache_tokyocabinet_delete_header(void *ctx, const char *key, size_t
 /**
  * hcache_tokyocabinet_close - Implements HcacheOps::close()
  */
-static void hcache_tokyocabinet_close(void **ctx)
+static void hcache_tokyocabinet_close(void **ptr)
 {
-  if (!ctx || !*ctx)
+  if (!ptr || !*ptr)
     return;
 
-  TCBDB *db = *ctx;
+  TCBDB *db = *ptr;
   if (!tcbdbclose(db))
   {
     int ecode = tcbdbecode(db);
     mutt_debug(LL_DEBUG2, "tcbdbclose failed: %s (ecode %d)\n", tcbdberrmsg(ecode), ecode);
   }
   tcbdbdel(db);
+  *ptr = NULL;
 }
 
 /**