imap: use imap_mailbox_status() in imap_mbox_check_stats()

This change calls imap_mailbox_status() instead of imap_status()
in imap_mbox_check_stats() as we known the Mailbox.

This also add more sanity check in imap_mailbox_status().

diff --git a/imap/imap.c b/imap/imap.c
index 2de5a439d36b99214a54b9603fb2ce09e85581db..8efc3c915361fd34e76cdbb87c522170c2a95249 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1309,10 +1309,7 @@ static int imap_status(struct ImapAccountData *adata, struct ImapMboxData *mdata
  */
 int imap_mbox_check_stats(struct Mailbox *m, int flags)
 {
-  struct ImapAccountData *adata = imap_adata_get(m);
-  struct ImapMboxData *mdata = imap_mdata_get(m);
-
-  int rc = imap_status(adata, mdata, true);
+  int rc = imap_mailbox_status(m, true);
   if (rc > 0)
     rc = 0;
   return rc;
@@ -1351,9 +1348,11 @@ int imap_path_status(const char *path, bool queue)
  */
 int imap_mailbox_status(struct Mailbox *m, bool queue)
 {
-  if (!m)
+  struct ImapAccountData *adata = imap_adata_get(m);
+  struct ImapMboxData *mdata = imap_mdata_get(m);
+  if (!adata || !mdata)
     return -1;
-  return imap_status(m->account->adata, m->mdata, queue);
+  return imap_status(adata, mdata, queue);
 }
 
 /**