Mercurial > dovecot > core-2.2
changeset 19695:9ca924a62d0b
imap: Removed now-unused cmd_sync_callback(), which doesn't work very well.
See commit message in b7b25e0 for more details.
author | Timo Sirainen <timo.sirainen@dovecot.fi> |
---|---|
date | Mon, 01 Feb 2016 20:30:26 +0200 |
parents | ef4bd9f4954c |
children | 3cc82c8c1b72 |
files | src/imap/imap-sync.c src/imap/imap-sync.h |
diffstat | 2 files changed, 9 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/imap-sync.c Mon Feb 01 20:26:19 2016 +0200 +++ b/src/imap/imap-sync.c Mon Feb 01 20:30:26 2016 +0200 @@ -20,7 +20,6 @@ enum mailbox_sync_flags flags; enum imap_sync_flags imap_flags; const char *tagline; - imap_sync_callback_t *callback; }; struct imap_sync_context { @@ -638,9 +637,6 @@ static bool cmd_finish_sync(struct client_command_context *cmd) { - if (cmd->sync->callback != NULL) - return cmd->sync->callback(cmd); - if (cmd->sync->tagline != NULL) client_send_tagline(cmd, cmd->sync->tagline); return TRUE; @@ -678,11 +674,12 @@ if (cmd->state == CLIENT_COMMAND_STATE_WAIT_SYNC && cmd != sync_cmd && cmd->sync->counter+1 == client->sync_counter) { - if (cmd_finish_sync(cmd)) - client_command_free(&cmd); + cmd_finish_sync(cmd); + client_command_free(&cmd); } } - return cmd_finish_sync(sync_cmd); + cmd_finish_sync(sync_cmd); + return TRUE; } static void get_common_sync_flags(struct client *client, @@ -755,10 +752,8 @@ return TRUE; } -static bool ATTR_NULL(4, 5) -cmd_sync_full(struct client_command_context *cmd, enum mailbox_sync_flags flags, - enum imap_sync_flags imap_flags, const char *tagline, - imap_sync_callback_t *callback) +bool cmd_sync(struct client_command_context *cmd, enum mailbox_sync_flags flags, + enum imap_sync_flags imap_flags, const char *tagline) { struct client *client = cmd->client; @@ -769,7 +764,6 @@ if (client->mailbox == NULL) { /* no mailbox selected, no point in delaying the sync */ - i_assert(callback == NULL); if (tagline != NULL) client_send_tagline(cmd, tagline); return TRUE; @@ -780,7 +774,6 @@ cmd->sync->flags = flags; cmd->sync->imap_flags = imap_flags; cmd->sync->tagline = p_strdup(cmd->pool, tagline); - cmd->sync->callback = callback; cmd->state = CLIENT_COMMAND_STATE_WAIT_SYNC; cmd->func = NULL; @@ -791,20 +784,6 @@ return FALSE; } -bool cmd_sync(struct client_command_context *cmd, enum mailbox_sync_flags flags, - enum imap_sync_flags imap_flags, const char *tagline) -{ - return cmd_sync_full(cmd, flags, imap_flags, tagline, NULL); -} - -bool cmd_sync_callback(struct client_command_context *cmd, - enum mailbox_sync_flags flags, - enum imap_sync_flags imap_flags, - imap_sync_callback_t *callback) -{ - return cmd_sync_full(cmd, flags, imap_flags, NULL, callback); -} - static bool cmd_sync_drop_fast(struct client *client) { struct client_command_context *cmd, *prev; @@ -822,10 +801,9 @@ i_assert(cmd->sync != NULL); if ((cmd->sync->flags & MAILBOX_SYNC_FLAG_FAST) != 0) { - if (cmd_finish_sync(cmd)) { - client_command_free(&cmd); - ret = TRUE; - } + cmd_finish_sync(cmd); + client_command_free(&cmd); + ret = TRUE; } } return ret;
--- a/src/imap/imap-sync.h Mon Feb 01 20:26:19 2016 +0200 +++ b/src/imap/imap-sync.h Mon Feb 01 20:30:26 2016 +0200 @@ -6,8 +6,6 @@ IMAP_SYNC_FLAG_SAFE = 0x02 }; -typedef bool imap_sync_callback_t(struct client_command_context *cmd); - struct client; struct imap_sync_context * @@ -22,10 +20,6 @@ bool cmd_sync(struct client_command_context *cmd, enum mailbox_sync_flags flags, enum imap_sync_flags imap_flags, const char *tagline); -bool cmd_sync_callback(struct client_command_context *cmd, - enum mailbox_sync_flags flags, - enum imap_sync_flags imap_flags, - imap_sync_callback_t *callback); bool cmd_sync_delayed(struct client *client) ATTR_NOWARN_UNUSED_RESULT; #endif