Mercurial > dovecot > core-2.2

changeset 21973:67b7d931e8a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imapc: Rename imapc_storage_has_modseqs() to imapc_mailbox_has_modseqs() Simplifies the following patch.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Sun, 23 Apr 2017 18:57:15 +0300
parents 1ea4631afc59
children b33e28d1e471
files src/lib-storage/index/imapc/imapc-mail.c src/lib-storage/index/imapc/imapc-mailbox.c src/lib-storage/index/imapc/imapc-storage.c src/lib-storage/index/imapc/imapc-storage.h src/lib-storage/index/imapc/imapc-sync.c
diffstat 5 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/imapc/imapc-mail.c	Fri Apr 21 12:54:17 2017 +0300
+++ b/src/lib-storage/index/imapc/imapc-mail.c	Sun Apr 23 18:57:15 2017 +0300
@@ -105,7 +105,7 @@
 	unsigned int count;
 	uint32_t rseq;
 
-	if (!imapc_storage_has_modseqs(mbox->storage))
+	if (!imapc_mailbox_has_modseqs(mbox))
 		return index_mail_get_modseq(_mail);
 
 	msgmap = imapc_client_mailbox_get_msgmap(mbox->client_box);
--- a/src/lib-storage/index/imapc/imapc-mailbox.c	Fri Apr 21 12:54:17 2017 +0300
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c	Sun Apr 23 18:57:15 2017 +0300
@@ -325,7 +325,7 @@
 				}
 			}
 		} else if (strcasecmp(atom, "MODSEQ") == 0 &&
-			   imapc_storage_has_modseqs(mbox->storage)) {
+			   imapc_mailbox_has_modseqs(mbox)) {
 			/* (modseq-number) */
 			if (!imap_arg_get_list(&list[i+1], &modseq_list))
 				return;
--- a/src/lib-storage/index/imapc/imapc-storage.c	Fri Apr 21 12:54:17 2017 +0300
+++ b/src/lib-storage/index/imapc/imapc-storage.c	Sun Apr 23 18:57:15 2017 +0300
@@ -75,14 +75,14 @@
 	return FALSE;
 }
 
-bool imapc_storage_has_modseqs(struct imapc_storage *storage)
+bool imapc_mailbox_has_modseqs(struct imapc_mailbox *mbox)
 {
 	enum imapc_capability capa =
-		imapc_client_get_capabilities(storage->client->client);
+		imapc_client_get_capabilities(mbox->storage->client->client);
 
 	return (capa & (IMAPC_CAPABILITY_CONDSTORE |
 			IMAPC_CAPABILITY_QRESYNC)) != 0 &&
-		IMAPC_HAS_FEATURE(storage, IMAPC_FEATURE_MODSEQ);
+		IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_MODSEQ);
 }
 
 static struct mail_storage *imapc_storage_alloc(void)
@@ -632,7 +632,7 @@
 		return -1;
 	}
 
-	if (imapc_storage_has_modseqs(mbox->storage)) {
+	if (imapc_mailbox_has_modseqs(mbox)) {
 		if (!array_is_created(&mbox->rseq_modseqs))
 			i_array_init(&mbox->rseq_modseqs, 32);
 		else
@@ -815,7 +815,7 @@
 		else if (strcasecmp(key, "UNSEEN") == 0)
 			status->unseen = num;
 		else if (strcasecmp(key, "HIGHESTMODSEQ") == 0 &&
-			 imapc_storage_has_modseqs(storage))
+			 imapc_mailbox_has_modseqs(storage->cur_status_box))
 			status->highest_modseq = num;
 	}
 }
@@ -875,7 +875,7 @@
 		   STATUS (HIGHESTMODSEQ), which isn't efficient since we get
 		   here constantly (after every IMAP command). */
 	}
-	if (imapc_storage_has_modseqs(mbox->storage)) {
+	if (imapc_mailbox_has_modseqs(mbox)) {
 		/* even if local indexes are only in memory, we still
 		   have modseqs on the IMAP server itself. */
 		status_r->nonpermanent_modseqs = FALSE;
@@ -910,7 +910,7 @@
 	if ((items & STATUS_UNSEEN) != 0)
 		str_append(str, " UNSEEN");
 	if ((items & STATUS_HIGHESTMODSEQ) != 0 &&
-	    imapc_storage_has_modseqs(mbox->storage))
+	    imapc_mailbox_has_modseqs(mbox))
 		str_append(str, " HIGHESTMODSEQ");
 
 	if (str_len(str) == 0) {
--- a/src/lib-storage/index/imapc/imapc-storage.h	Fri Apr 21 12:54:17 2017 +0300
+++ b/src/lib-storage/index/imapc/imapc-storage.h	Sun Apr 23 18:57:15 2017 +0300
@@ -171,7 +171,7 @@
 void imapc_mail_cache_free(struct imapc_mail_cache *cache);
 int imapc_mailbox_select(struct imapc_mailbox *mbox);
 
-bool imapc_storage_has_modseqs(struct imapc_storage *storage);
+bool imapc_mailbox_has_modseqs(struct imapc_mailbox *mbox);
 bool imap_resp_text_code_parse(const char *str, enum mail_error *error_r);
 void imapc_copy_error_from_reply(struct imapc_storage *storage,
 				 enum mail_error default_error,
--- a/src/lib-storage/index/imapc/imapc-sync.c	Fri Apr 21 12:54:17 2017 +0300
+++ b/src/lib-storage/index/imapc/imapc-sync.c	Sun Apr 23 18:57:15 2017 +0300
@@ -248,7 +248,7 @@
 
 static void imapc_sync_highestmodseq(struct imapc_sync_context *ctx)
 {
-	if (imapc_storage_has_modseqs(ctx->mbox->storage) &&
+	if (imapc_mailbox_has_modseqs(ctx->mbox) &&
 	    mail_index_modseq_get_highest(ctx->sync_view) < ctx->mbox->sync_highestmodseq)
 		mail_index_update_highest_modseq(ctx->trans, ctx->mbox->sync_highestmodseq);
 }
@@ -320,7 +320,7 @@
 	string_t *cmd = t_str_new(64);
 
 	str_printfa(cmd, "UID FETCH %u:* (FLAGS", first_uid);
-	if (imapc_storage_has_modseqs(ctx->mbox->storage)) {
+	if (imapc_mailbox_has_modseqs(ctx->mbox)) {
 		str_append(cmd, " MODSEQ");
 		mail_index_modseq_enable(ctx->mbox->box.index);
 	}