From: Siavash Tavakoli <siavash.tavakoli@open-xchange.com>
Date: Thu, 4 Feb 2021 15:57:09 +0000 (+0000)
Subject: lib-storage: Add mailbox_guid_cache_add_mailbox()
X-Git-Tag: 2.3.15~408
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd350bc887c0e29ed823f21f49aad3c087f1175a;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Add mailbox_guid_cache_add_mailbox()

Refactored caching logic in mailbox_guid_cache_refresh to this new
function.
---

diff --git a/src/lib-storage/mailbox-guid-cache.c b/src/lib-storage/mailbox-guid-cache.c
index 6e754fae88..99c0e5b7e6 100644
--- a/src/lib-storage/mailbox-guid-cache.c
+++ b/src/lib-storage/mailbox-guid-cache.c
@@ -37,15 +37,41 @@ int mailbox_guid_cache_find(struct mailbox_list *list,
 	return 0;
 }
 
-void mailbox_guid_cache_refresh(struct mailbox_list *list)
+static void mailbox_guid_cache_add_mailbox(struct mailbox_list *list,
+					   const struct mailbox_info *info)
 {
-	struct mailbox_list_iterate_context *ctx;
-	const struct mailbox_info *info;
 	struct mailbox *box;
 	struct mailbox_metadata metadata;
 	struct mailbox_guid_cache_rec *rec;
 	uint8_t *guid_p;
 
+	box = mailbox_alloc(list, info->vname, 0);
+	if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID,
+				 &metadata) < 0) {
+		i_error("Couldn't get mailbox %s GUID: %s",
+			info->vname, mailbox_get_last_internal_error(box, NULL));
+		list->guid_cache_errors = TRUE;
+	} else if ((rec = hash_table_lookup(list->guid_cache,
+			(const uint8_t *)metadata.guid)) != NULL) {
+		i_warning("Mailbox %s has duplicate GUID with %s: %s",
+			  info->vname, rec->vname,
+			  guid_128_to_string(metadata.guid));
+	} else {
+		rec = p_new(list->guid_cache_pool,
+			    struct mailbox_guid_cache_rec, 1);
+		memcpy(rec->guid, metadata.guid, sizeof(rec->guid));
+		rec->vname = p_strdup(list->guid_cache_pool, info->vname);
+		guid_p = rec->guid;
+		hash_table_insert(list->guid_cache, guid_p, rec);
+	}
+	mailbox_free(&box);
+}
+
+void mailbox_guid_cache_refresh(struct mailbox_list *list)
+{
+	struct mailbox_list_iterate_context *ctx;
+	const struct mailbox_info *info;
+
 	if (!hash_table_is_created(list->guid_cache)) {
 		list->guid_cache_pool =
 			pool_alloconly_create("guid cache", 1024*16);
@@ -66,27 +92,7 @@ void mailbox_guid_cache_refresh(struct mailbox_list *list)
 		if ((info->flags &
 		     (MAILBOX_NOSELECT | MAILBOX_NONEXISTENT)) != 0)
 			continue;
-
-		box = mailbox_alloc(list, info->vname, 0);
-		if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID,
-					 &metadata) < 0) {
-			i_error("Couldn't get mailbox %s GUID: %s",
-				info->vname, mailbox_get_last_internal_error(box, NULL));
-			list->guid_cache_errors = TRUE;
-		} else if ((rec = hash_table_lookup(list->guid_cache,
-				(const uint8_t *)metadata.guid)) != NULL) {
-			i_warning("Mailbox %s has duplicate GUID with %s: %s",
-				  info->vname, rec->vname,
-				  guid_128_to_string(metadata.guid));
-		} else {
-			rec = p_new(list->guid_cache_pool,
-				    struct mailbox_guid_cache_rec, 1);
-			memcpy(rec->guid, metadata.guid, sizeof(rec->guid));
-			rec->vname = p_strdup(list->guid_cache_pool, info->vname);
-			guid_p = rec->guid;
-			hash_table_insert(list->guid_cache, guid_p, rec);
-		}
-		mailbox_free(&box);
+		mailbox_guid_cache_add_mailbox(list, info);
 	}
 	if (mailbox_list_iter_deinit(&ctx) < 0)
 		list->guid_cache_errors = TRUE;