From: Timo Sirainen Date: Sat, 9 May 2015 16:39:39 +0000 (+0300) Subject: doveadm: Removed unused doveadm_mailbox_find_and_sync() function X-Git-Tag: 2.2.17.rc1~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4ba52b8290d366b5763df03be6709af3da0bc57;p=thirdparty%2Fdovecot%2Fcore.git doveadm: Removed unused doveadm_mailbox_find_and_sync() function --- diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c index 3b3e827a6c..3537e2a8b1 100644 --- a/src/doveadm/doveadm-mail.c +++ b/src/doveadm/doveadm-mail.c @@ -243,38 +243,6 @@ doveadm_mailbox_find(struct mail_user *user, const char *mailbox) return mailbox_alloc(ns->list, mailbox, MAILBOX_FLAG_IGNORE_ACLS); } -static int -doveadm_mailbox_find_and_open(struct mail_user *user, const char *mailbox, - struct mailbox **box_r) -{ - struct mailbox *box; - - box = doveadm_mailbox_find(user, mailbox); - if (mailbox_open(box) < 0) { - i_error("Opening mailbox %s failed: %s", mailbox, - mailbox_get_last_error(box, NULL)); - mailbox_free(&box); - return -1; - } - *box_r = box; - return 0; -} - -int doveadm_mailbox_find_and_sync(struct mail_user *user, const char *mailbox, - struct mailbox **box_r) -{ - if (doveadm_mailbox_find_and_open(user, mailbox, box_r) < 0) - return -1; - if (mailbox_sync(*box_r, MAILBOX_SYNC_FLAG_FULL_READ) < 0) { - i_error("Syncing mailbox %s failed: %s", mailbox, - mailbox_get_last_error(*box_r, NULL)); - mailbox_free(box_r); - mailbox_free(box_r); - return -1; - } - return 0; -} - struct mail_search_args * doveadm_mail_build_search_args(const char *const args[]) { diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h index 327bc54528..681c309e72 100644 --- a/src/doveadm/doveadm-mail.h +++ b/src/doveadm/doveadm-mail.h @@ -146,8 +146,6 @@ void doveadm_mail_get_input(struct doveadm_mail_cmd_context *ctx); struct mailbox * doveadm_mailbox_find(struct mail_user *user, const char *mailbox); -int doveadm_mailbox_find_and_sync(struct mail_user *user, const char *mailbox, - struct mailbox **box_r); struct mail_search_args * doveadm_mail_build_search_args(const char *const args[]); void doveadm_mailbox_args_check(const char *const args[]);