]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-storage: imapc_mailbox_get_selected_status() can't fail - remove dead code
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Thu, 5 Oct 2017 10:02:21 +0000 (13:02 +0300)
committerTimo Sirainen <tss@dovecot.fi>
Thu, 5 Oct 2017 11:31:38 +0000 (14:31 +0300)
src/lib-storage/index/imapc/imapc-storage.c

index 98585f90dc0c2a5a2bf62891419a5de6af52277f..6979d82e79c9b3a069c25d560da1c6fcd9774e49 100644 (file)
@@ -910,12 +910,10 @@ static void imapc_untagged_namespace(const struct imapc_untagged_reply *reply,
        }
 }
 
-static int imapc_mailbox_get_selected_status(struct imapc_mailbox *mbox,
-                                            enum mailbox_status_items items,
-                                            struct mailbox_status *status_r)
+static void imapc_mailbox_get_selected_status(struct imapc_mailbox *mbox,
+                                             enum mailbox_status_items items,
+                                             struct mailbox_status *status_r)
 {
-       int ret = 0;
-
        index_storage_get_open_status(&mbox->box, items, status_r);
        if ((items & STATUS_PERMANENT_FLAGS) != 0)
                status_r->permanent_flags = mbox->permanent_flags;
@@ -935,7 +933,6 @@ static int imapc_mailbox_get_selected_status(struct imapc_mailbox *mbox,
                   have modseqs on the IMAP server itself. */
                status_r->nonpermanent_modseqs = FALSE;
        }
-       return ret;
 }
 
 static int imapc_mailbox_delete(struct mailbox *box)
@@ -1001,17 +998,14 @@ static int imapc_mailbox_get_status(struct mailbox *box,
                status_r->have_guids = TRUE;
 
        if (box->opened) {
-               if (imapc_mailbox_get_selected_status(mbox, items, status_r) < 0) {
-                       /* can't do anything about this */
-               }
+               imapc_mailbox_get_selected_status(mbox, items, status_r);
        } else if ((items & (STATUS_FIRST_UNSEEN_SEQ | STATUS_KEYWORDS |
                             STATUS_PERMANENT_FLAGS |
                             STATUS_FIRST_RECENT_UID)) != 0) {
                /* getting these requires opening the mailbox */
                if (mailbox_open(box) < 0)
                        return -1;
-               if (imapc_mailbox_get_selected_status(mbox, items, status_r) < 0)
-                       return -1;
+               imapc_mailbox_get_selected_status(mbox, items, status_r);
        } else {
                if (imapc_mailbox_run_status(box, items, status_r) < 0)
                        return -1;