From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 28 Nov 2018 10:48:47 +0000 (+0200)
Subject: imap: Cleanup - don't avoid calling mailbox_enable(box, 0)
X-Git-Tag: 2.3.9~1036
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=579db0c8a32a4dad0529ea1ed8856e59e338466e;p=thirdparty%2Fdovecot%2Fcore.git

imap: Cleanup - don't avoid calling mailbox_enable(box, 0)

This simplifies the following changes. mailbox_enable() is an efficient
function and it doesn't mind being called with features=0 parameter.
---

diff --git a/src/imap/cmd-notify.c b/src/imap/cmd-notify.c
index fa4b46ad79..2a7c198942 100644
--- a/src/imap/cmd-notify.c
+++ b/src/imap/cmd-notify.c
@@ -437,8 +437,7 @@ imap_notify_box_send_status(struct client_command_context *cmd,
 
 	box = mailbox_alloc(info->ns->list, info->vname, MAILBOX_FLAG_READONLY);
 	mailbox_set_reason(box, "NOTIFY send STATUS");
-	if (ctx->client->enabled_features != 0)
-		(void)mailbox_enable(box, ctx->client->enabled_features);
+	(void)mailbox_enable(box, ctx->client->enabled_features);
 
 	if (imap_status_get(cmd, info->ns, info->vname, &items, &result) < 0) {
 		if (result.error == MAIL_ERROR_PERM)
diff --git a/src/imap/cmd-select.c b/src/imap/cmd-select.c
index c6defc99a5..9892377430 100644
--- a/src/imap/cmd-select.c
+++ b/src/imap/cmd-select.c
@@ -290,8 +290,7 @@ select_open(struct imap_select_context *ctx, const char *mailbox, bool readonly)
 		return -1;
 	}
 
-	if (client->enabled_features != 0)
-		ret = mailbox_enable(ctx->box, client->enabled_features);
+	ret = mailbox_enable(ctx->box, client->enabled_features);
 	if (ret < 0 ||
 	    mailbox_sync(ctx->box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
 		client_send_box_error(ctx->cmd, ctx->box);
diff --git a/src/imap/imap-commands-util.c b/src/imap/imap-commands-util.c
index 95c86a9a9f..5a9fc47861 100644
--- a/src/imap/imap-commands-util.c
+++ b/src/imap/imap-commands-util.c
@@ -121,12 +121,10 @@ int client_open_save_dest_box(struct client_command_context *cmd,
 		mailbox_free(&box);
 		return -1;
 	}
-	if (cmd->client->enabled_features != 0) {
-		if (mailbox_enable(box, cmd->client->enabled_features) < 0) {
-			client_send_box_error(cmd, box);
-			mailbox_free(&box);
-			return -1;
-		}
+	if (mailbox_enable(box, cmd->client->enabled_features) < 0) {
+		client_send_box_error(cmd, box);
+		mailbox_free(&box);
+		return -1;
 	}
 	*destbox_r = box;
 	return 0;
diff --git a/src/imap/imap-state.c b/src/imap/imap-state.c
index fa6e4246a5..36d52d7884 100644
--- a/src/imap/imap-state.c
+++ b/src/imap/imap-state.c
@@ -586,8 +586,7 @@ import_state_mailbox_open(struct client *client,
 		return -1;
 	}
 
-	if (client->enabled_features != 0)
-		ret = mailbox_enable(box, client->enabled_features);
+	ret = mailbox_enable(box, client->enabled_features);
 	if (ret < 0 || mailbox_sync(box, 0) < 0) {
 		*error_r = t_strdup_printf("Couldn't sync mailbox: %s",
 			mailbox_get_last_internal_error(box, NULL));
diff --git a/src/imap/imap-status.c b/src/imap/imap-status.c
index 01cb8f8883..578e483e1b 100644
--- a/src/imap/imap-status.c
+++ b/src/imap/imap-status.c
@@ -75,8 +75,7 @@ int imap_status_get(struct client_command_context *cmd,
 		/* open the mailbox */
 		box = mailbox_alloc(ns->list, mailbox, MAILBOX_FLAG_READONLY);
 		mailbox_set_reason(box, "STATUS");
-		if (client->enabled_features != 0)
-			(void)mailbox_enable(box, client->enabled_features);
+		(void)mailbox_enable(box, client->enabled_features);
 	}
 
 	if ((items->status & STATUS_HIGHESTMODSEQ) != 0)