rename Mailbox private data

diff --git a/browser.c b/browser.c
index 6fdb1b2f0a377f50d6ae41a2705b36e825998584..6e9187a9cbc4b258d3b16ada81a75c9c53584ce5 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -676,7 +676,7 @@ static const char *group_index_format_str(char *buf, size_t buflen, size_t col,
       break;
 
     case 'n':
-      if (Context && Context->mailbox->data == folder->ff->nd)
+      if (Context && Context->mailbox->mdata == folder->ff->nd)
       {
         snprintf(fmt, sizeof(fmt), "%%%sd", prec);
         snprintf(buf, buflen, fmt, Context->new);
@@ -708,7 +708,7 @@ static const char *group_index_format_str(char *buf, size_t buflen, size_t col,
                               group_index_format_str, data, flags);
         }
       }
-      else if (Context && Context->mailbox->data == folder->ff->nd)
+      else if (Context && Context->mailbox->mdata == folder->ff->nd)
       {
         snprintf(fmt, sizeof(fmt), "%%%sd", prec);
         snprintf(buf, buflen, fmt, Context->mailbox->msg_unread);

diff --git a/curs_main.c b/curs_main.c
index 082efe0bb7a43c52ae4741e91e957838566304cf..b19062d082032128aa8552d3a1e577ad0937559f 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -3004,7 +3004,7 @@ int mutt_index_menu(void)
         CHECK_ATTACH
         if (Context && Context->mailbox->magic == MUTT_NNTP)
         {
-          struct NntpMboxData *mdata = Context->mailbox->data;
+          struct NntpMboxData *mdata = Context->mailbox->mdata;
           if (mutt_newsgroup_catchup(Context, mdata->adata, mdata->group))
             menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
         }
@@ -3316,7 +3316,7 @@ int mutt_index_menu(void)
                              _("Reply by mail as poster prefers?")) != MUTT_YES)
         {
           if (Context && Context->mailbox->magic == MUTT_NNTP &&
-              !((struct NntpMboxData *) Context->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+              !((struct NntpMboxData *) Context->mailbox->mdata)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
           {
             break;
           }

diff --git a/imap/imap.c b/imap/imap.c
index 8a2b0c223e69aaa0f7bc3e1acdbf9b0307e53db0..3c505114692337bd585f729816ebd4344506f790 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -729,7 +729,7 @@ int imap_delete_mailbox(struct Mailbox *mailbox, struct ImapMbox *mx)
   }
   else
   {
-    adata = mailbox->data;
+    adata = mailbox->mdata;
   }
 
   imap_munge_mbox_name(adata, mbox, sizeof(mbox), mx->mbox);
@@ -2229,7 +2229,7 @@ static int imap_mbox_open(struct Context *ctx)
     goto fail;
 
   /* once again the context is new */
-  ctx->mailbox->data = adata;
+  ctx->mailbox->mdata = adata;
 
   /* Clean up path and replace the one in the mailbox */
   imap_fix_path(adata, mx.mbox, buf, sizeof(buf));
@@ -2472,7 +2472,7 @@ static int imap_mbox_open_append(struct Context *ctx, int flags)
     return -1;
   }
 
-  ctx->mailbox->data = adata;
+  ctx->mailbox->mdata = adata;
 
   imap_fix_path(adata, mx.mbox, mailbox, sizeof(mailbox));
   if (!*mailbox)

diff --git a/imap/util.c b/imap/util.c
index 0bb418fc4486649d2e5844989032599df9158ba6..046e67987aef002c9fdc91c5fb113c55f281f7aa 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -71,7 +71,7 @@ struct ImapAccountData *imap_get_adata(struct Mailbox *m)
 {
   if (!m || (m->magic != MUTT_IMAP))
     return NULL;
-  return m->data;
+  return m->mdata;
 }
 
 /**

diff --git a/mailbox.c b/mailbox.c
index e203975af1083361da12e2ac28266c16e1e03553..a7fa194e5e4708519a72cc9a0270796d9a56b873 100644 (file)
--- a/mailbox.c
+++ b/mailbox.c
@@ -122,8 +122,8 @@ void mailbox_free(struct Mailbox **mailbox)
     return;
 
   FREE(&(*mailbox)->desc);
-  if ((*mailbox)->data && (*mailbox)->free_data)
-    (*mailbox)->free_data(&(*mailbox)->data);
+  if ((*mailbox)->mdata && (*mailbox)->free_mdata)
+    (*mailbox)->free_mdata(&(*mailbox)->mdata);
   FREE(mailbox);
 }
 

diff --git a/mailbox.h b/mailbox.h
index 5311758d033ebba56b254b04bc6ffebae8813f68..d2807b6c40d8aa6d2a72152b3295b52091ebaef5 100644 (file)
--- a/mailbox.h
+++ b/mailbox.h
@@ -98,8 +98,6 @@ struct Mailbox
   struct timespec last_visited;       /**< time of last exit from this mailbox */
   struct timespec stats_last_checked; /**< mtime of mailbox the last time stats where checked. */
 
-  void *data;                 /**< driver specific data */
-  void (*free_data)(void **); /**< driver-specific data free function */
   const struct MxOps *mx_ops;
 
   bool changed : 1;   /**< mailbox has been modified */
@@ -118,6 +116,9 @@ struct Mailbox
   struct Hash *label_hash;  /**< hash table for x-labels */
 
   int flags; /**< e.g. #MB_NORMAL */
+
+  void *mdata;                 /**< driver specific data */
+  void (*free_mdata)(void **); /**< driver-specific data free function */
 };
 
 /**

diff --git a/maildir/mh.c b/maildir/mh.c
index cb0cb4b9ee0ded1ae136c45646002882e6662af4..696194af4ed800230fbae0ef2e2b6aa1a3c1ca65 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -121,7 +121,7 @@ static struct MaildirMboxData *maildir_get_mdata(struct Mailbox *m)
 {
   if (!m || ((m->magic != MUTT_MAILDIR) && (m->magic != MUTT_MH)))
     return NULL;
-  return m->data;
+  return m->mdata;
 }
 
 /**
@@ -1239,9 +1239,9 @@ static int mh_read_dir(struct Context *ctx, const char *subdir)
     mutt_progress_init(&progress, msgbuf, MUTT_PROGRESS_MSG, ReadInc, 0);
   }
 
-  if (!ctx->mailbox->data)
+  if (!ctx->mailbox->mdata)
   {
-    ctx->mailbox->data = mutt_mem_calloc(1, sizeof(struct MaildirMboxData));
+    ctx->mailbox->mdata = mutt_mem_calloc(1, sizeof(struct MaildirMboxData));
   }
   struct MaildirMboxData *mdata = maildir_get_mdata(ctx->mailbox);
 
@@ -2977,7 +2977,7 @@ err:
  */
 static int mh_mbox_close(struct Context *ctx)
 {
-  FREE(&ctx->mailbox->data);
+  FREE(&ctx->mailbox->mdata);
 
   return 0;
 }

diff --git a/mbox/mbox.c b/mbox/mbox.c
index bfc9b03c3963d9cd97d6077c6fd859bc6cf5a23d..1b9ea6ef3c31bde4e731a5ad11504f2edce90133 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -113,14 +113,14 @@ static int init_mailbox(struct Mailbox *mailbox)
   if (!mailbox || (mailbox->magic != MUTT_MBOX))
     return -1;
 
-  if (mailbox->data)
+  if (mailbox->mdata)
     return 0;
 
-  mailbox->data = new_mboxdata();
-  if (!mailbox->data)
+  mailbox->mdata = new_mboxdata();
+  if (!mailbox->mdata)
     return -1;
 
-  mailbox->free_data = free_mboxdata;
+  mailbox->free_mdata = free_mboxdata;
   return 0;
 }
 
@@ -133,7 +133,7 @@ struct MboxMboxData *mbox_get_mdata(struct Mailbox *m)
 {
   if (!m || (m->magic != MUTT_MBOX))
     return NULL;
-  return m->data;
+  return m->mdata;
 }
 
 /**

diff --git a/mx.c b/mx.c
index 67ddbef5a49b5d6685f7d4bbea4f6c74b6149e1a..2fbb19f257d46b21895ec1643fb9b6fd7d2d7a28 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -514,7 +514,7 @@ int mx_mbox_close(struct Context **pctx, int *index_hint)
 #ifdef USE_NNTP
   if (ctx->mailbox->msg_unread && ctx->mailbox->magic == MUTT_NNTP)
   {
-    struct NntpMboxData *mdata = ctx->mailbox->data;
+    struct NntpMboxData *mdata = ctx->mailbox->mdata;
 
     if (mdata && mdata->adata && mdata->group)
     {

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 847fde72e61e245c77574bb82307c1172d30cf2e..dbb815e56a0d0e82cdddf14fb53cbfb538eed6e0 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -323,7 +323,7 @@ int nntp_newsrc_parse(struct NntpAccountData *adata)
  */
 void nntp_newsrc_gen_entries(struct Context *ctx)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   anum_t last = 0, first = 1;
   bool series;
   int save_sort = SORT_ORDER;
@@ -1213,7 +1213,7 @@ struct NntpAccountData *nntp_select_server(struct Mailbox *mailbox, char *server
  */
 void nntp_article_status(struct Mailbox *mailbox, struct Email *e, char *group, anum_t anum)
 {
-  struct NntpMboxData *mdata = mailbox->data;
+  struct NntpMboxData *mdata = mailbox->mdata;
 
   if (group)
     mdata = mutt_hash_find(mdata->adata->groups_hash, group);
@@ -1322,7 +1322,7 @@ struct NntpMboxData *mutt_newsgroup_catchup(struct Context *ctx,
     mdata->newsrc_ent[0].last = mdata->last_message;
   }
   mdata->unread = 0;
-  if (ctx && ctx->mailbox->data == mdata)
+  if (ctx && ctx->mailbox->mdata == mdata)
   {
     for (unsigned int i = 0; i < ctx->mailbox->msg_count; i++)
       mutt_set_flag(ctx, ctx->mailbox->hdrs[i], MUTT_READ, 1);
@@ -1357,7 +1357,7 @@ struct NntpMboxData *mutt_newsgroup_uncatchup(struct Context *ctx,
     mdata->newsrc_ent[0].first = 1;
     mdata->newsrc_ent[0].last = mdata->first_message - 1;
   }
-  if (ctx && ctx->mailbox->data == mdata)
+  if (ctx && ctx->mailbox->mdata == mdata)
   {
     mdata->unread = ctx->mailbox->msg_count;
     for (unsigned int i = 0; i < ctx->mailbox->msg_count; i++)
@@ -1391,7 +1391,7 @@ void nntp_mailbox(struct Mailbox *mailbox, char *buf, size_t buflen)
       continue;
 
     if ((mailbox->magic == MUTT_NNTP) &&
-        (mutt_str_strcmp(mdata->group, ((struct NntpMboxData *) mailbox->data)->group) == 0))
+        (mutt_str_strcmp(mdata->group, ((struct NntpMboxData *) mailbox->mdata)->group) == 0))
     {
       unsigned int unread = 0;
 

diff --git a/nntp/nntp.c b/nntp/nntp.c
index ed021a6640a26be0fd31b5592afdd74c947ee51a..b9fda09e28a7f56fff9e6fa5cc160501862e267d 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -909,7 +909,7 @@ static int get_description(struct NntpMboxData *mdata, const char *wildmat, cons
  */
 static void nntp_parse_xref(struct Mailbox *mailbox, struct Email *e)
 {
-  struct NntpMboxData *mdata = mailbox->data;
+  struct NntpMboxData *mdata = mailbox->mdata;
 
   char *buf = mutt_str_strdup(e->env->xref);
   char *p = buf;
@@ -991,7 +991,7 @@ static int parse_overview_line(char *line, void *data)
 {
   struct FetchCtx *fc = data;
   struct Context *ctx = fc->ctx;
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   struct Email *e = NULL;
   char *header = NULL, *field = NULL;
   bool save = true;
@@ -1146,7 +1146,7 @@ static int parse_overview_line(char *line, void *data)
 static int nntp_fetch_headers(struct Context *ctx, void *hc, anum_t first,
                               anum_t last, int restore)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   struct FetchCtx fc;
   struct Email *e = NULL;
   char buf[HUGE_STRING];
@@ -1432,7 +1432,7 @@ static int nntp_group_poll(struct NntpMboxData *mdata, int update_stat)
  */
 static int check_mailbox(struct Context *ctx)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   struct NntpAccountData *adata = mdata->adata;
   time_t now = time(NULL);
   int rc, ret = 0;
@@ -1879,7 +1879,7 @@ int nntp_post(struct Mailbox *mailbox, const char *msg)
   char buf[LONG_STRING];
 
   if (mailbox && (mailbox->magic == MUTT_NNTP))
-    mdata = mailbox->data;
+    mdata = mailbox->mdata;
   else
   {
     CurrentNewsSrv = nntp_select_server(mailbox, NewsServer, false);
@@ -2055,7 +2055,7 @@ int nntp_check_new_groups(struct Mailbox *mailbox, struct NntpAccountData *adata
     if (Context && (Context->mailbox->magic == MUTT_NNTP))
     {
       buf[0] = '\0';
-      if (nntp_query(Context->mailbox->data, buf, sizeof(buf)) < 0)
+      if (nntp_query(Context->mailbox->mdata, buf, sizeof(buf)) < 0)
         return -1;
     }
   }
@@ -2068,7 +2068,7 @@ int nntp_check_new_groups(struct Mailbox *mailbox, struct NntpAccountData *adata
     return -1;
   tmp_mdata.adata = adata;
   if (Context && (Context->mailbox->magic == MUTT_NNTP))
-    tmp_mdata.group = ((struct NntpMboxData *) Context->mailbox->data)->group;
+    tmp_mdata.group = ((struct NntpMboxData *) Context->mailbox->mdata)->group;
   else
     tmp_mdata.group = NULL;
   i = adata->groups_num;
@@ -2135,7 +2135,7 @@ int nntp_check_new_groups(struct Mailbox *mailbox, struct NntpAccountData *adata
  */
 int nntp_check_msgid(struct Context *ctx, const char *msgid)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   char buf[LONG_STRING];
 
   FILE *fp = mutt_file_mkstemp();
@@ -2202,7 +2202,7 @@ int nntp_check_msgid(struct Context *ctx, const char *msgid)
  */
 int nntp_check_children(struct Context *ctx, const char *msgid)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   struct ChildCtx cc;
   char buf[STRING];
   int rc;
@@ -2378,7 +2378,7 @@ static int nntp_mbox_open(struct Context *ctx)
   }
 
   time(&adata->check_time);
-  ctx->mailbox->data = mdata;
+  ctx->mailbox->mdata = mdata;
   if (!mdata->bcache && (mdata->newsrc_ent || mdata->subscribed || SaveUnsubscribed))
     mdata->bcache = mutt_bcache_open(&adata->conn->account, mdata->group);
 
@@ -2426,7 +2426,7 @@ static int nntp_mbox_check(struct Context *ctx, int *index_hint)
   int ret = check_mailbox(ctx);
   if (ret == 0)
   {
-    struct NntpMboxData *mdata = ctx->mailbox->data;
+    struct NntpMboxData *mdata = ctx->mailbox->mdata;
     struct NntpAccountData *adata = mdata->adata;
     nntp_newsrc_close(adata);
   }
@@ -2440,7 +2440,7 @@ static int nntp_mbox_check(struct Context *ctx, int *index_hint)
  */
 static int nntp_mbox_sync(struct Context *ctx, int *index_hint)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   int rc;
 #ifdef USE_HCACHE
   header_cache_t *hc = NULL;
@@ -2501,7 +2501,7 @@ static int nntp_mbox_sync(struct Context *ctx, int *index_hint)
  */
 static int nntp_mbox_close(struct Context *ctx)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data, *tmp_mdata = NULL;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata, *tmp_mdata = NULL;
   if (!mdata)
     return 0;
 
@@ -2522,7 +2522,7 @@ static int nntp_mbox_close(struct Context *ctx)
  */
 static int nntp_msg_open(struct Context *ctx, struct Message *msg, int msgno)
 {
-  struct NntpMboxData *mdata = ctx->mailbox->data;
+  struct NntpMboxData *mdata = ctx->mailbox->mdata;
   struct Email *e = ctx->mailbox->hdrs[msgno];
   char article[16];
 

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index d859df1a1d0be0391df2630f13c7b320d3362573..f9b0f936f214da161756c29e20b0c6a089b8d4e1 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -276,7 +276,7 @@ struct NmMboxData *nm_get_default_data(void)
 static struct NmMboxData *get_mboxdata(struct Mailbox *mailbox)
 {
   if (mailbox && (mailbox->magic == MUTT_NOTMUCH))
-    return mailbox->data;
+    return mailbox->mdata;
 
   return NULL;
 }
@@ -296,14 +296,14 @@ static int init_mailbox(struct Mailbox *mailbox)
   if (!mailbox || (mailbox->magic != MUTT_NOTMUCH))
     return -1;
 
-  if (mailbox->data)
+  if (mailbox->mdata)
     return 0;
 
-  mailbox->data = new_mboxdata(mailbox->path);
-  if (!mailbox->data)
+  mailbox->mdata = new_mboxdata(mailbox->path);
+  if (!mailbox->mdata)
     return -1;
 
-  mailbox->free_data = free_mboxdata;
+  mailbox->free_mdata = free_mboxdata;
   return 0;
 }
 
@@ -1998,7 +1998,7 @@ bool nm_normalize_uri(const char *uri, char *buf, size_t buflen)
     return false;
 
   tmp_mbox.magic = MUTT_NOTMUCH;
-  tmp_mbox.data = tmp_mdata;
+  tmp_mbox.mdata = tmp_mdata;
 
   mutt_debug(2, "#1 () -> db_query: %s\n", tmp_mdata->db_query);
 

diff --git a/pager.c b/pager.c
index 3ff085deedf12e1641a35fe795a53ddd3eb162e0..8d62ca7dcf4e6609e5fb4973029fc0764f5581ab 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -3087,7 +3087,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         CHECK_MODE(IsHeader(extra) && !IsAttach(extra));
         CHECK_ATTACH;
         if (extra->ctx && extra->ctx->mailbox->magic == MUTT_NNTP &&
-            !((struct NntpMboxData *) extra->ctx->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+            !((struct NntpMboxData *) extra->ctx->mailbox->mdata)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
         {
           break;
         }
@@ -3099,7 +3099,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         CHECK_MODE(IsHeader(extra) || IsMsgAttach(extra));
         CHECK_ATTACH;
         if (extra->ctx && extra->ctx->mailbox->magic == MUTT_NNTP &&
-            !((struct NntpMboxData *) extra->ctx->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+            !((struct NntpMboxData *) extra->ctx->mailbox->mdata)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
         {
           break;
         }
@@ -3125,7 +3125,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
                              _("Reply by mail as poster prefers?")) != MUTT_YES)
         {
           if (extra->ctx && extra->ctx->mailbox->magic == MUTT_NNTP &&
-              !((struct NntpMboxData *) extra->ctx->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+              !((struct NntpMboxData *) extra->ctx->mailbox->mdata)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
           {
             break;
           }

diff --git a/pop/pop.c b/pop/pop.c
index d7b43fc917a176c3d9986ae8499cdb25c3b98f7a..0f97a1a02f96913b60f7edc5631dce5b32901707 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -761,8 +761,8 @@ static int pop_mbox_open(struct Context *ctx)
 
   struct PopMboxData *mdata = new_mboxdata();
   mdata->conn = conn;
-  ctx->mailbox->data = mdata;
-  ctx->mailbox->free_data = free_mboxdata;
+  ctx->mailbox->mdata = mdata;
+  ctx->mailbox->free_mdata = free_mboxdata;
 
   if (pop_open_connection(mdata) < 0)
     return -1;

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index fb906f6c082c5e14957773d0cadc39830949895b..ca58016729c6b0f694d3307d7934c6dba365a769 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -659,5 +659,5 @@ struct PopMboxData *pop_get_mdata(struct Mailbox *m)
 {
   if (!m || (m->magic != MUTT_POP))
     return NULL;
-  return m->data;
+  return m->mdata;
 }

diff --git a/send.c b/send.c
index d16bfbb55994973bc732ba438754a0fe7d560919..818b94c8a7c2cd6a5ccea3f043cb4921eebab669 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1730,7 +1730,7 @@ int ci_send_message(int flags, struct Email *msg, char *tempfile,
     if ((flags & SEND_NEWS) && ctx && ctx->mailbox->magic == MUTT_NNTP &&
         !msg->env->newsgroups)
       msg->env->newsgroups =
-          mutt_str_strdup(((struct NntpMboxData *) ctx->mailbox->data)->group);
+          mutt_str_strdup(((struct NntpMboxData *) ctx->mailbox->mdata)->group);
 #endif
 
     if (!(flags & (SEND_MAILX | SEND_BATCH)) && !(Autoedit && EditHeaders) &&