From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 29 Nov 2021 16:05:18 +0000 (+0100)
Subject: lib-storage: Remove index_mail_data.seq
X-Git-Tag: 2.3.18~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd7248b70725856799200841d89cdccf7133db0e;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Remove index_mail_data.seq

The seq already exists in struct mail, so this unnecessarily duplicated it.
---

diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c
index 74d07e5110..d9603628e5 100644
--- a/src/lib-storage/index/index-mail-headers.c
+++ b/src/lib-storage/index/index-mail-headers.c
@@ -205,7 +205,7 @@ void index_mail_parse_header_init(struct index_mail *mail,
 	index_mail_filter_stream_destroy(mail);
 	i_assert(!mail->data.header_parser_initialized);
 
-	mail->header_seq = data->seq;
+	mail->header_seq = mail->mail.mail.seq;
 	if (mail->header_data == NULL) {
 		mail->header_data = buffer_create_dynamic(default_pool, 4096);
 		i_array_init(&mail->header_lines, 32);
@@ -681,7 +681,7 @@ index_mail_get_raw_headers(struct index_mail *mail, const char *field,
 			mail_set_aborted(&mail->mail.mail);
 			return -1;
 		}
-		if (mail->header_seq != mail->data.seq ||
+		if (mail->header_seq != mail->mail.mail.seq ||
 		    index_mail_header_is_parsed(mail, field_idx) < 0) {
 			/* parse */
 			const char *reason = index_mail_cache_reason(_mail,
diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index aedf620a1a..a663e3e0c9 100644
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -81,7 +81,7 @@ int index_mail_cache_lookup_field(struct index_mail *mail, buffer_t *buf,
 	int ret;
 
 	ret = mail_cache_lookup_field(mail->mail.mail.transaction->cache_view,
-				      buf, mail->data.seq, field_idx);
+				      buf, mail->mail.mail.seq, field_idx);
 	if (ret > 0)
 		mail->mail.mail.transaction->stats.cache_hit_count++;
 
@@ -341,7 +341,7 @@ index_mail_get_keyword_indexes(struct mail *_mail)
 	if (!array_is_created(&data->keyword_indexes)) {
 		p_array_init(&data->keyword_indexes, mail->mail.data_pool, 32);
 		mail_index_lookup_keywords(_mail->transaction->view,
-					   mail->data.seq,
+					   mail->mail.mail.seq,
 					   &data->keyword_indexes);
 	}
 	return &data->keyword_indexes;
@@ -2113,7 +2113,7 @@ void index_mail_set_seq(struct mail *_mail, uint32_t seq, bool saving)
 	struct mail_index_map *map;
 	bool expunged;
 
-	if (mail->data.seq == seq) {
+	if (mail->mail.mail.seq == seq) {
 		if (!saving)
 			return;
 		/* we started saving a mail, aborted it, and now we're saving
@@ -2123,7 +2123,6 @@ void index_mail_set_seq(struct mail *_mail, uint32_t seq, bool saving)
 
 	mail->mail.v.close(&mail->mail.mail);
 
-	mail->data.seq = seq;
 	mail->mail.mail.seq = seq;
 	mail->mail.mail.saving = saving;
 
diff --git a/src/lib-storage/index/index-mail.h b/src/lib-storage/index/index-mail.h
index d0137da5e3..afd2404131 100644
--- a/src/lib-storage/index/index-mail.h
+++ b/src/lib-storage/index/index-mail.h
@@ -87,7 +87,6 @@ struct index_mail_data {
 	const char *from_envelope, *body_snippet;
 	struct message_part_envelope *envelope_data;
 
-	uint32_t seq;
 	uint32_t cache_flags;
 	uint64_t modseq, pvt_modseq;
 	enum index_mail_access_part access_part;