From 55d35a8b8036093b94fb1bb0f0339fc43fad52e1 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 26 Apr 2017 14:57:40 +0300 Subject: [PATCH] imap: Move struct imap_sync_context to imap-sync-private.h --- src/imap/Makefile.am | 3 ++- src/imap/imap-sync-private.h | 35 +++++++++++++++++++++++++++++++++++ src/imap/imap-sync.c | 31 +------------------------------ 3 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 src/imap/imap-sync-private.h diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am index 608c2cdd45..a61d8117d7 100644 --- a/src/imap/Makefile.am +++ b/src/imap/Makefile.am @@ -105,7 +105,8 @@ headers = \ imap-settings.h \ imap-status.h \ imap-state.h \ - imap-sync.h + imap-sync.h \ + imap-sync-private.h pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) diff --git a/src/imap/imap-sync-private.h b/src/imap/imap-sync-private.h new file mode 100644 index 0000000000..21d4a1ee28 --- /dev/null +++ b/src/imap/imap-sync-private.h @@ -0,0 +1,35 @@ +#ifndef IMAP_SYNC_PRIVATE_H +#define IMAP_SYNC_PRIVATE_H + +#include "imap-sync.h" + +struct imap_sync_context { + struct client *client; + struct mailbox *box; + enum imap_sync_flags imap_flags; + + struct mailbox_transaction_context *t; + struct mailbox_sync_context *sync_ctx; + struct mail *mail; + + struct mailbox_status status; + struct mailbox_sync_status sync_status; + + struct mailbox_sync_rec sync_rec; + ARRAY_TYPE(keywords) tmp_keywords; + ARRAY_TYPE(seq_range) expunges; + uint32_t seq; + + ARRAY_TYPE(seq_range) search_adds, search_removes; + unsigned int search_update_idx; + + unsigned int messages_count; + + bool failed:1; + bool finished:1; + bool no_newmail:1; + bool have_new_mails:1; + bool search_update_notifying:1; +}; + +#endif diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c index b56d9179cb..83a320f371 100644 --- a/src/imap/imap-sync.c +++ b/src/imap/imap-sync.c @@ -11,7 +11,7 @@ #include "imap-fetch.h" #include "imap-notify.h" #include "imap-commands.h" -#include "imap-sync.h" +#include "imap-sync-private.h" struct client_sync_context { /* if multiple commands are in progress, we may need to wait for them @@ -22,35 +22,6 @@ struct client_sync_context { const char *tagline; }; -struct imap_sync_context { - struct client *client; - struct mailbox *box; - enum imap_sync_flags imap_flags; - - struct mailbox_transaction_context *t; - struct mailbox_sync_context *sync_ctx; - struct mail *mail; - - struct mailbox_status status; - struct mailbox_sync_status sync_status; - - struct mailbox_sync_rec sync_rec; - ARRAY_TYPE(keywords) tmp_keywords; - ARRAY_TYPE(seq_range) expunges; - uint32_t seq; - - ARRAY_TYPE(seq_range) search_adds, search_removes; - unsigned int search_update_idx; - - unsigned int messages_count; - - bool failed:1; - bool finished:1; - bool no_newmail:1; - bool have_new_mails:1; - bool search_update_notifying:1; -}; - static void uids_to_seqs(struct mailbox *box, ARRAY_TYPE(seq_range) *uids) { T_BEGIN { -- 2.47.3