From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 30 Mar 2020 14:22:38 +0000 (+0300)
Subject: lib-index: Rename mail_cache_unlock() to mail_cache_flush_and_unlock()
X-Git-Tag: 2.3.11.2~393
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d53ed39617d4c299fb96253a1324cc6f55d5366;p=thirdparty%2Fdovecot%2Fcore.git

lib-index: Rename mail_cache_unlock() to mail_cache_flush_and_unlock()

This describes better what it does, because it's not just unlocking.
---

diff --git a/src/lib-index/mail-cache-compress.c b/src/lib-index/mail-cache-compress.c
index 088c71a5b6..3f0a9d6ccb 100644
--- a/src/lib-index/mail-cache-compress.c
+++ b/src/lib-index/mail-cache-compress.c
@@ -366,7 +366,7 @@ mail_cache_compress_write(struct mail_cache *cache,
 	array_free(&ext_offsets);
 
 	if (*unlock) {
-		(void)mail_cache_unlock(cache);
+		(void)mail_cache_flush_and_unlock(cache);
 		*unlock = FALSE;
 	}
 
@@ -435,7 +435,7 @@ static int mail_cache_compress_locked(struct mail_cache *cache,
 		cache->need_compress_file_seq = 0;
 
 		if (*unlock) {
-			(void)mail_cache_unlock(cache);
+			(void)mail_cache_flush_and_unlock(cache);
 			*unlock = FALSE;
 		}
 
@@ -511,7 +511,7 @@ mail_cache_compress_full(struct mail_cache *cache,
 	ret = mail_cache_compress_locked(cache, compress_file_seq, trans, &unlock);
 	cache->compressing = FALSE;
 	if (unlock) {
-		if (mail_cache_unlock(cache) < 0)
+		if (mail_cache_flush_and_unlock(cache) < 0)
 			ret = -1;
 	}
 	if (ret < 0) {
diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
index ac2c33a9b7..dc2e753d86 100644
--- a/src/lib-index/mail-cache-fields.c
+++ b/src/lib-index/mail-cache-fields.c
@@ -563,7 +563,7 @@ int mail_cache_header_fields_update(struct mail_cache *cache)
 	T_BEGIN {
 		ret = mail_cache_header_fields_update_locked(cache);
 	} T_END;
-	if (mail_cache_unlock(cache) < 0)
+	if (mail_cache_flush_and_unlock(cache) < 0)
 		ret = -1;
 	return ret;
 }
diff --git a/src/lib-index/mail-cache-private.h b/src/lib-index/mail-cache-private.h
index 981cd62caa..b063622ddb 100644
--- a/src/lib-index/mail-cache-private.h
+++ b/src/lib-index/mail-cache-private.h
@@ -212,7 +212,7 @@ struct mail_cache_lookup_iterate_ctx {
 int mail_cache_lock(struct mail_cache *cache);
 int mail_cache_try_lock(struct mail_cache *cache);
 /* Returns -1 if cache is / just got corrupted, 0 if ok. */
-int mail_cache_unlock(struct mail_cache *cache);
+int mail_cache_flush_and_unlock(struct mail_cache *cache);
 
 int mail_cache_write(struct mail_cache *cache, const void *data, size_t size,
 		     uoff_t offset);
diff --git a/src/lib-index/mail-cache-sync-update.c b/src/lib-index/mail-cache-sync-update.c
index 4db24084cd..a79745dd5e 100644
--- a/src/lib-index/mail-cache-sync-update.c
+++ b/src/lib-index/mail-cache-sync-update.c
@@ -17,7 +17,7 @@ void mail_cache_expunge_count(struct mail_cache *cache, unsigned int count)
 		else
 			 cache->hdr_copy.record_count = 0;
 		cache->hdr_modified = TRUE;
-		(void)mail_cache_unlock(cache);
+		(void)mail_cache_flush_and_unlock(cache);
 	}
 }
 
diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c
index bb40023c3c..7353d90260 100644
--- a/src/lib-index/mail-cache-transaction.c
+++ b/src/lib-index/mail-cache-transaction.c
@@ -156,7 +156,7 @@ void mail_cache_transaction_rollback(struct mail_cache_transaction_ctx **_ctx)
 		if (mail_cache_transaction_lock(ctx) > 0) {
 			ctx->cache->hdr_copy.deleted_record_count +=
 				ctx->records_written;
-			(void)mail_cache_unlock(ctx->cache);
+			(void)mail_cache_flush_and_unlock(ctx->cache);
 		}
 	}
 
@@ -219,7 +219,7 @@ static int mail_cache_transaction_lock(struct mail_cache_transaction_ctx *ctx)
 		   it to free up some space. */
 		if (cache->hdr->continued_record_count > 0 ||
 		    cache->hdr->deleted_record_count > 0) {
-			(void)mail_cache_unlock(cache);
+			(void)mail_cache_flush_and_unlock(cache);
 			(void)mail_cache_transaction_compress(ctx);
 			return mail_cache_transaction_lock(ctx);
 		}
@@ -467,7 +467,7 @@ mail_cache_transaction_flush(struct mail_cache_transaction_ctx *ctx)
 	i_assert(ctx->last_rec_pos <= ctx->cache_data->used);
 
 	if (mail_cache_transaction_update_fields(ctx) < 0) {
-		(void)mail_cache_unlock(ctx->cache);
+		(void)mail_cache_flush_and_unlock(ctx->cache);
 		return -1;
 	}
 
@@ -495,7 +495,7 @@ mail_cache_transaction_flush(struct mail_cache_transaction_ctx *ctx)
 		ctx->records_written++;
 		mail_cache_transaction_update_index(ctx, write_offset);
 	}
-	if (mail_cache_unlock(ctx->cache) < 0)
+	if (mail_cache_flush_and_unlock(ctx->cache) < 0)
 		ret = -1;
 	return ret;
 }
diff --git a/src/lib-index/mail-cache.c b/src/lib-index/mail-cache.c
index fa7ae1f472..1e4149225f 100644
--- a/src/lib-index/mail-cache.c
+++ b/src/lib-index/mail-cache.c
@@ -825,7 +825,7 @@ mail_cache_lock_full(struct mail_cache *cache, bool nonblock)
 	if (cache->read_buf != NULL)
 		buffer_set_used_size(cache->read_buf, 0);
 	if ((ret = mail_cache_map_all(cache)) <= 0) {
-		(void)mail_cache_unlock(cache);
+		(void)mail_cache_flush_and_unlock(cache);
 		return ret;
 	}
 	cache->hdr_copy = *cache->hdr;
@@ -842,7 +842,7 @@ int mail_cache_try_lock(struct mail_cache *cache)
 	return mail_cache_lock_full(cache, TRUE);
 }
 
-int mail_cache_unlock(struct mail_cache *cache)
+int mail_cache_flush_and_unlock(struct mail_cache *cache)
 {
 	int ret = 0;