From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 19 May 2017 14:44:30 +0000 (+0300)
Subject: imap: Move struct client_sync_context to imap-sync-private.h and add imap_ prefix
X-Git-Tag: 2.2.30.rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f193b50ac61b978a048618d40f1f07019fa409ee;p=thirdparty%2Fdovecot%2Fcore.git

imap: Move struct client_sync_context to imap-sync-private.h and add imap_ prefix
---

diff --git a/src/imap/imap-client.h b/src/imap/imap-client.h
index 8ea9e5b9e1..5cde0d6e6e 100644
--- a/src/imap/imap-client.h
+++ b/src/imap/imap-client.h
@@ -105,7 +105,7 @@ struct client_command_context {
 	struct client_command_stats stats;
 	struct client_command_stats_start stats_start;
 
-	struct client_sync_context *sync;
+	struct imap_client_sync_context *sync;
 
 	unsigned int uid:1; /* used UID command */
 	unsigned int cancel:1; /* command is wanted to be cancelled */
diff --git a/src/imap/imap-sync-private.h b/src/imap/imap-sync-private.h
index a153bc8c70..4d97bcc70f 100644
--- a/src/imap/imap-sync-private.h
+++ b/src/imap/imap-sync-private.h
@@ -3,6 +3,15 @@
 
 #include "imap-sync.h"
 
+struct imap_client_sync_context {
+	/* if multiple commands are in progress, we may need to wait for them
+	   to finish before syncing mailbox. */
+	unsigned int counter;
+	enum mailbox_sync_flags flags;
+	enum imap_sync_flags imap_flags;
+	const char *tagline;
+};
+
 struct imap_sync_context {
 	struct client *client;
 	struct mailbox *box;
diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c
index e856b625e4..9698353e15 100644
--- a/src/imap/imap-sync.c
+++ b/src/imap/imap-sync.c
@@ -13,15 +13,6 @@
 #include "imap-commands.h"
 #include "imap-sync-private.h"
 
-struct client_sync_context {
-	/* if multiple commands are in progress, we may need to wait for them
-	   to finish before syncing mailbox. */
-	unsigned int counter;
-	enum mailbox_sync_flags flags;
-	enum imap_sync_flags imap_flags;
-	const char *tagline;
-};
-
 static void uids_to_seqs(struct mailbox *box, ARRAY_TYPE(seq_range) *uids)
 {
 	T_BEGIN {
@@ -755,7 +746,7 @@ bool cmd_sync(struct client_command_context *cmd, enum mailbox_sync_flags flags,
 	}
 	cmd->tagline_reply = p_strdup(cmd->pool, tagline);
 
-	cmd->sync = p_new(cmd->pool, struct client_sync_context, 1);
+	cmd->sync = p_new(cmd->pool, struct imap_client_sync_context, 1);
 	cmd->sync->counter = client->sync_counter;
 	cmd->sync->flags = flags;
 	cmd->sync->imap_flags = imap_flags;