replace 'BUFFY' with 'struct Buffy'

diff --git a/browser.c b/browser.c
index c9f70af169ee6e2924db3087cb5e8e690ab00084..ca53f68df3873dac61818071c58687a329fa47af 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -560,7 +560,7 @@ static const char *newsgroup_format_str(char *dest, size_t destlen, size_t col,
 #endif /* USE_NNTP */
 
 static void add_folder(MUTTMENU *m, struct browser_state *state, const char *name,
-                       const char *desc, const struct stat *s, BUFFY *b, void *data)
+                       const char *desc, const struct stat *s, struct Buffy *b, void *data)
 {
   if (state->entrylen == state->entrymax)
   {
@@ -648,7 +648,7 @@ static int examine_directory(MUTTMENU *menu, struct browser_state *state,
     DIR *dp = NULL;
     struct dirent *de = NULL;
     char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-    BUFFY *tmp = NULL;
+    struct Buffy *tmp = NULL;
 
     while (stat(d, &s) == -1)
     {
@@ -719,7 +719,7 @@ static int examine_directory(MUTTMENU *menu, struct browser_state *state,
 #ifdef USE_NOTMUCH
 static int examine_vfolders(MUTTMENU *menu, struct browser_state *state)
 {
-  BUFFY *tmp = VirtIncoming;
+  struct Buffy *tmp = VirtIncoming;
 
   if (!VirtIncoming)
     return -1;
@@ -767,7 +767,7 @@ static int examine_mailboxes(MUTTMENU *menu, struct browser_state *state)
   else
 #endif
   {
-    BUFFY *tmp = Incoming;
+    struct Buffy *tmp = Incoming;
 
     if (!Incoming)
       return -1;

diff --git a/buffy.c b/buffy.c
index 02ac97f2ee8fe4b772dad7153dd9f0213f937065..db77cdd371bc88615619da6f2a962e05a006014e 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -134,13 +134,13 @@ static int test_new_folder(const char *path)
   return rc;
 }
 
-static BUFFY *buffy_new(const char *path)
+static struct Buffy *buffy_new(const char *path)
 {
-  BUFFY *buffy = NULL;
+  struct Buffy *buffy = NULL;
   char rp[PATH_MAX] = "";
   char *r = NULL;
 
-  buffy = safe_calloc(1, sizeof(BUFFY));
+  buffy = safe_calloc(1, sizeof(struct Buffy));
   strfcpy(buffy->path, path, sizeof(buffy->path));
   r = realpath(path, rp);
   strfcpy(buffy->realpath, r ? rp : path, sizeof(buffy->realpath));
@@ -150,7 +150,7 @@ static BUFFY *buffy_new(const char *path)
   return buffy;
 }
 
-static void buffy_free(BUFFY **mailbox)
+static void buffy_free(struct Buffy **mailbox)
 {
   if (mailbox && *mailbox)
     FREE(&(*mailbox)->desc);
@@ -162,7 +162,7 @@ static void buffy_free(BUFFY **mailbox)
  * check_stats: if true, count total, new, and flagged messages.
  * Returns 1 if the dir has new mail.
  */
-static int buffy_maildir_check_dir(BUFFY *mailbox, const char *dir_name,
+static int buffy_maildir_check_dir(struct Buffy *mailbox, const char *dir_name,
                                    int check_new, int check_stats)
 {
   char path[_POSIX_PATH_MAX];
@@ -242,7 +242,7 @@ static int buffy_maildir_check_dir(BUFFY *mailbox, const char *dir_name,
  * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
-static int buffy_maildir_check(BUFFY *mailbox, int check_stats)
+static int buffy_maildir_check(struct Buffy *mailbox, int check_stats)
 {
   int rc, check_new = 1;
 
@@ -267,7 +267,7 @@ static int buffy_maildir_check(BUFFY *mailbox, int check_stats)
  * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
-static int buffy_mbox_check(BUFFY *mailbox, struct stat *sb, int check_stats)
+static int buffy_mbox_check(struct Buffy *mailbox, struct stat *sb, int check_stats)
 {
   int rc = 0;
   int new_or_changed;
@@ -313,7 +313,7 @@ static int buffy_mbox_check(BUFFY *mailbox, struct stat *sb, int check_stats)
   return rc;
 }
 
-static void buffy_check(BUFFY *tmp, struct stat *contex_sb, int check_stats)
+static void buffy_check(struct Buffy *tmp, struct stat *contex_sb, int check_stats)
 {
   struct stat sb;
 #ifdef USE_SIDEBAR
@@ -421,9 +421,9 @@ static void buffy_check(BUFFY *tmp, struct stat *contex_sb, int check_stats)
 }
 
 /* fetch buffy object for given path, if present */
-static BUFFY *buffy_get(const char *path)
+static struct Buffy *buffy_get(const char *path)
 {
-  BUFFY *cur = NULL;
+  struct Buffy *cur = NULL;
   char *epath = NULL;
 
   if (!path)
@@ -450,7 +450,7 @@ static BUFFY *buffy_get(const char *path)
 void mutt_buffy_cleanup(const char *buf, struct stat *st)
 {
   struct utimbuf ut;
-  BUFFY *tmp = NULL;
+  struct Buffy *tmp = NULL;
 
   if (option(OPTCHECKMBOXSIZE))
   {
@@ -472,9 +472,9 @@ void mutt_buffy_cleanup(const char *buf, struct stat *st)
   }
 }
 
-BUFFY *mutt_find_mailbox(const char *path)
+struct Buffy *mutt_find_mailbox(const char *path)
 {
-  BUFFY *tmp = NULL;
+  struct Buffy *tmp = NULL;
   struct stat sb;
   struct stat tmp_sb;
 
@@ -490,7 +490,7 @@ BUFFY *mutt_find_mailbox(const char *path)
   return tmp;
 }
 
-void mutt_update_mailbox(BUFFY *b)
+void mutt_update_mailbox(struct Buffy *b)
 {
   struct stat sb;
 
@@ -506,7 +506,7 @@ void mutt_update_mailbox(BUFFY *b)
 
 int mutt_parse_mailboxes(struct Buffer *path, struct Buffer *s, unsigned long data, struct Buffer *err)
 {
-  BUFFY **tmp = NULL, *tmp1 = NULL;
+  struct Buffy **tmp = NULL, *tmp1 = NULL;
   char buf[_POSIX_PATH_MAX];
   struct stat sb;
   char f1[PATH_MAX];
@@ -596,7 +596,7 @@ int mutt_parse_virtual_mailboxes(struct Buffer *path, struct Buffer *s, unsigned
   if (!path || !s)
     return -1;
 
-  BUFFY **tmp;
+  struct Buffy **tmp;
   char buf[_POSIX_PATH_MAX + LONG_STRING + 32]; /* path to DB + query + URI "decoration" */
 
   while (MoreArgs(s))
@@ -651,7 +651,7 @@ int mutt_parse_virtual_mailboxes(struct Buffer *path, struct Buffer *s, unsigned
 
 int mutt_parse_unvirtual_mailboxes(struct Buffer *path, struct Buffer *s, unsigned long data, struct Buffer *err)
 {
-  BUFFY **tmp = NULL, *tmp1 = NULL;
+  struct Buffy **tmp = NULL, *tmp1 = NULL;
 
   while (MoreArgs(s))
   {
@@ -702,7 +702,7 @@ int mutt_parse_unvirtual_mailboxes(struct Buffer *path, struct Buffer *s, unsign
  */
 int mutt_buffy_check(int force)
 {
-  BUFFY *tmp = NULL;
+  struct Buffy *tmp = NULL;
   struct stat contex_sb;
   time_t t;
   int check_stats = 0;
@@ -766,7 +766,7 @@ int mutt_buffy_check(int force)
 
 int mutt_buffy_list(void)
 {
-  BUFFY *tmp = NULL;
+  struct Buffy *tmp = NULL;
   char path[_POSIX_PATH_MAX];
   char buffylist[2 * STRING];
   size_t pos = 0;
@@ -820,7 +820,7 @@ int mutt_buffy_list(void)
 
 void mutt_buffy_setnotified(const char *path)
 {
-  BUFFY *buffy = NULL;
+  struct Buffy *buffy = NULL;
 
   buffy = buffy_get(path);
   if (!buffy)
@@ -847,7 +847,7 @@ int mutt_buffy_notify(void)
  */
 void mutt_buffy(char *s, size_t slen)
 {
-  BUFFY *tmp = Incoming;
+  struct Buffy *tmp = Incoming;
   int pass, found = 0;
 
   mutt_expand_path(s, slen);
@@ -878,7 +878,7 @@ void mutt_buffy(char *s, size_t slen)
 #ifdef USE_NOTMUCH
 void mutt_buffy_vfolder(char *s, size_t slen)
 {
-  BUFFY *tmp = NULL;
+  struct Buffy *tmp = NULL;
   int pass, found = 0;
 
   if (mutt_buffy_check(0))

diff --git a/buffy.h b/buffy.h
index 3957b75086356f94853a715126af5a5d57f3e6c5..f69678c884359d8a2220579890223c07ed67e5f2 100644 (file)
--- a/buffy.h
+++ b/buffy.h
@@ -22,14 +22,14 @@
 #define MUTT_MAILBOXES   1
 #define MUTT_UNMAILBOXES 2
 
-typedef struct buffy_t
+struct Buffy
 {
   char path[_POSIX_PATH_MAX];
   char realpath[_POSIX_PATH_MAX]; /* used for duplicate detection, context comparison,
                                      and the sidebar */
   char *desc;
   off_t size;
-  struct buffy_t *next;
+  struct Buffy *next;
   bool new; /* mailbox has new mail */
 
   /* These next three are only set when OPTMAILCHECKSTATS is set */
@@ -42,21 +42,21 @@ typedef struct buffy_t
   bool newly_created;        /* mbox or mmdf just popped into existence */
   time_t last_visited;       /* time of last exit from this mailbox */
   time_t stats_last_checked; /* mtime of mailbox the last time stats where checked. */
-} BUFFY;
+};
 
-WHERE BUFFY *Incoming INITVAL(0);
+WHERE struct Buffy *Incoming INITVAL(0);
 WHERE short BuffyTimeout INITVAL(3);
 WHERE short BuffyCheckStatsInterval INITVAL(60);
 
 #ifdef USE_NOTMUCH
-WHERE BUFFY *VirtIncoming INITVAL(0);
+WHERE struct Buffy *VirtIncoming INITVAL(0);
 void mutt_buffy_vfolder(char *s, size_t slen);
 #endif
 
 extern time_t BuffyDoneTime; /* last time we knew for sure how much mail there was */
 
-BUFFY *mutt_find_mailbox(const char *path);
-void mutt_update_mailbox(BUFFY *b);
+struct Buffy *mutt_find_mailbox(const char *path);
+void mutt_update_mailbox(struct Buffy *b);
 
 /* fixes up atime + mtime after mbox/mmdf mailbox was modified
    according to stat() info taken before a modification */
@@ -65,6 +65,6 @@ void mutt_buffy_cleanup(const char *buf, struct stat *st);
 /* mark mailbox just left as already notified */
 void mutt_buffy_setnotified(const char *path);
 
-int mh_buffy(BUFFY *mailbox, int check_stats);
+int mh_buffy(struct Buffy *mailbox, int check_stats);
 
 #endif /* _MUTT_BUFFY_H */

diff --git a/commands.c b/commands.c
index 83d72b77a91be7297784312972dd1db36d0cb7fe..c75e859d469c1f8295f55b99cd7091ca51671b08 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -820,7 +820,7 @@ int mutt_save_message(HEADER *h, int delete, int decode, int decrypt)
 #ifdef USE_COMPRESSED
     /* If we're saving to a compressed mailbox, the stats won't be updated
      * until the next open.  Until then, improvise. */
-    BUFFY *cm = NULL;
+    struct Buffy *cm = NULL;
     if (ctx.compress_info)
       cm = mutt_find_mailbox(ctx.realpath);
     /* We probably haven't been opened yet */

diff --git a/imap/browse.c b/imap/browse.c
index 254c9172abe3f2fe17277d317584046fc742b52f..93ba5dda8572fdde922da3854ab9e6ad57b5abd0 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -37,7 +37,7 @@ static void imap_add_folder(char delim, char *folder, int noselect, int noinferi
   char tmp[LONG_STRING];
   char relpath[LONG_STRING];
   IMAP_MBOX mx;
-  BUFFY *b = NULL;
+  struct Buffy *b = NULL;
 
   if (imap_parse_path(state->folder, &mx))
     return;

diff --git a/imap/command.c b/imap/command.c
index c53c35eef656e94783c4cbec299f6aae224b7bdd..04009bf0251f827dcb09ee068cb4a08970151407 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -484,7 +484,7 @@ static void cmd_parse_status(IMAP_DATA *idata, char *s)
 {
   char *mailbox = NULL;
   char *value = NULL;
-  BUFFY *inc = NULL;
+  struct Buffy *inc = NULL;
   IMAP_MBOX mx;
   int count;
   IMAP_STATUS *status = NULL;

diff --git a/imap/imap.c b/imap/imap.c
index 1b6c1b879c9b7d8b327a269aac56616c8653daf0..f47945e7f147e8166892f2d72c739921d4f33b09 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1499,7 +1499,7 @@ int imap_buffy_check(int force, int check_stats)
 {
   IMAP_DATA *idata = NULL;
   IMAP_DATA *lastdata = NULL;
-  BUFFY *mailbox = NULL;
+  struct Buffy *mailbox = NULL;
   char name[LONG_STRING];
   char command[LONG_STRING];
   char munged[LONG_STRING];
@@ -1922,7 +1922,7 @@ static int longest_common_prefix(char *dest, const char *src, int start, size_t
  * to complete over open connections and account/folder hooks too. */
 static int imap_complete_hosts(char *dest, size_t len)
 {
-  BUFFY *mailbox = NULL;
+  struct Buffy *mailbox = NULL;
   CONNECTION *conn = NULL;
   int rc = -1;
   int matchlen;

diff --git a/mbox.c b/mbox.c
index 82ca4530302de0f38abb93e6c03424bd0cdf7a0d..93b10a23d10620d93b9a04e719c9cc4323b3132d 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -1010,7 +1010,7 @@ static int mbox_sync_mailbox(CONTEXT *ctx, int *index_hint)
   FILE *fp = NULL;
   progress_t progress;
   char msgbuf[STRING];
-  BUFFY *tmp = NULL;
+  struct Buffy *tmp = NULL;
 
   /* sort message by their position in the mailbox on disk */
   if (Sort != SORT_ORDER)

diff --git a/mh.c b/mh.c
index 38783c8fae39f73ee3283787385e6dbd48767121..66040aabc20ee43ae8dd587e05dc900d555f51f3 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -216,7 +216,7 @@ static inline mode_t mh_umask(CONTEXT *ctx)
  * Returns 0 if the modification time is older
  * Returns -1 on error
  */
-static int mh_sequences_changed(BUFFY *b)
+static int mh_sequences_changed(struct Buffy *b)
 {
   char path[_POSIX_PATH_MAX];
   struct stat sb;
@@ -232,7 +232,7 @@ static int mh_sequences_changed(BUFFY *b)
  * Returns 0 if the modtime is newer
  * Returns -1 on error
  */
-static int mh_already_notified(BUFFY *b, int msgno)
+static int mh_already_notified(struct Buffy *b, int msgno)
 {
   char path[_POSIX_PATH_MAX];
   struct stat sb;
@@ -261,7 +261,7 @@ static bool mh_valid_message(const char *s)
  * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
-int mh_buffy(BUFFY *mailbox, int check_stats)
+int mh_buffy(struct Buffy *mailbox, int check_stats)
 {
   int i;
   struct mh_sequences mhs;

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index 58b28889740002e31aa9aaf0de690f9aab052f10..28c7e97defd96bd7a2d50fc2d81078e462bf9dd4 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -1999,7 +1999,7 @@ done:
 
 char *nm_get_description(CONTEXT *ctx)
 {
-  BUFFY *p = NULL;
+  struct Buffy *p = NULL;
 
   for (p = VirtIncoming; p; p = p->next)
     if (p->desc && (strcmp(p->path, ctx->path) == 0))
@@ -2010,7 +2010,7 @@ char *nm_get_description(CONTEXT *ctx)
 
 int nm_description_to_path(const char *desc, char *buf, size_t bufsz)
 {
-  BUFFY *p = NULL;
+  struct Buffy *p = NULL;
 
   if (!desc || !buf || !bufsz)
     return -EINVAL;

diff --git a/sidebar.c b/sidebar.c
index ddd7dc37ad81e1a4b4a76ae202efd2c60a3ea0d9..94ebce9bcc23fdc913af1665f6a254169e70b43e 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -40,7 +40,7 @@ static short PreviousSort = SORT_ORDER; /* sidebar_sort_method */
 typedef struct sidebar_entry
 {
   char box[STRING]; /* formatted mailbox name */
-  BUFFY *buffy;
+  struct Buffy *buffy;
   short is_hidden;
 } SBENTRY;
 
@@ -69,7 +69,7 @@ enum
 };
 static int sidebar_source = SB_SRC_NONE;
 
-static BUFFY *get_incoming(void)
+static struct Buffy *get_incoming(void)
 {
   switch (sidebar_source)
   {
@@ -132,7 +132,7 @@ static const char *cb_format_str(char *dest, size_t destlen, size_t col, int col
 
   dest[0] = 0; /* Just in case there's nothing to do */
 
-  BUFFY *b = sbe->buffy;
+  struct Buffy *b = sbe->buffy;
   if (!b)
     return src;
 
@@ -297,8 +297,8 @@ static int cb_qsort_sbe(const void *a, const void *b)
 {
   const SBENTRY *sbe1 = *(const SBENTRY **) a;
   const SBENTRY *sbe2 = *(const SBENTRY **) b;
-  BUFFY *b1 = sbe1->buffy;
-  BUFFY *b2 = sbe2->buffy;
+  struct Buffy *b1 = sbe1->buffy;
+  struct Buffy *b2 = sbe2->buffy;
 
   int result = 0;
 
@@ -335,7 +335,7 @@ static int cb_qsort_sbe(const void *a, const void *b)
  * update_entries_visibility - Should a sidebar_entry be displayed in the sidebar
  *
  * For each SBENTRY in the Entries array, check whether we should display it.
- * This is determined by several criteria.  If the BUFFY:
+ * This is determined by several criteria.  If the Buffy:
  *      is the currently open mailbox
  *      is the currently highlighted mailbox
  *      has unread messages
@@ -379,7 +379,7 @@ static void update_entries_visibility(void)
  */
 static void unsort_entries(void)
 {
-  BUFFY *cur = get_incoming();
+  struct Buffy *cur = get_incoming();
   int i = 0, j;
   SBENTRY *tmp = NULL;
 
@@ -817,7 +817,7 @@ static void draw_sidebar(int num_rows, int num_cols, int div_width)
 {
   int entryidx;
   SBENTRY *entry = NULL;
-  BUFFY *b = NULL;
+  struct Buffy *b = NULL;
   if (TopIndex < 0)
     return;
 
@@ -955,7 +955,7 @@ static void draw_sidebar(int num_rows, int num_cols, int div_width)
  * mutt_sb_draw - Completely redraw the sidebar
  *
  * Completely refresh the sidebar region.  First draw the divider; then, for
- * each BUFFY, call make_sidebar_entry; finally blank out any remaining space.
+ * each Buffy, call make_sidebar_entry; finally blank out any remaining space.
  */
 void mutt_sb_draw(void)
 {
@@ -975,7 +975,7 @@ void mutt_sb_draw(void)
 
   int div_width = draw_divider(num_rows, num_cols);
 
-  BUFFY *b = NULL;
+  struct Buffy *b = NULL;
   if (Entries == NULL)
     for (b = get_incoming(); b; b = b->next)
       mutt_sb_notify_mailbox(b, 1);
@@ -1049,17 +1049,17 @@ void mutt_sb_change_mailbox(int op)
 }
 
 /**
- * mutt_sb_set_buffystats - Update the BUFFY's message counts from the CONTEXT
+ * mutt_sb_set_buffystats - Update the Buffy's message counts from the CONTEXT
  * @ctx:  A mailbox CONTEXT
  *
- * Given a mailbox CONTEXT, find a matching mailbox BUFFY and copy the message
+ * Given a mailbox CONTEXT, find a matching mailbox Buffy and copy the message
  * counts into it.
  */
 void mutt_sb_set_buffystats(const CONTEXT *ctx)
 {
   /* Even if the sidebar's hidden,
    * we should take note of the new data. */
-  BUFFY *b = get_incoming();
+  struct Buffy *b = get_incoming();
   if (!ctx || !b)
     return;
 
@@ -1076,7 +1076,7 @@ void mutt_sb_set_buffystats(const CONTEXT *ctx)
 }
 
 /**
- * mutt_sb_get_highlight - Get the BUFFY that's highlighted in the sidebar
+ * mutt_sb_get_highlight - Get the Buffy that's highlighted in the sidebar
  *
  * Get the path of the mailbox that's highlighted in the sidebar.
  *
@@ -1097,7 +1097,7 @@ const char *mutt_sb_get_highlight(void)
 /**
  * mutt_sb_set_open_buffy - Set the OpnBuffy based on the global Context
  *
- * Search through the list of mailboxes.  If a BUFFY has a matching path, set
+ * Search through the list of mailboxes.  If a Buffy has a matching path, set
  * OpnBuffy to it.
  */
 void mutt_sb_set_open_buffy(void)
@@ -1121,15 +1121,15 @@ void mutt_sb_set_open_buffy(void)
 }
 
 /**
- * mutt_sb_notify_mailbox - The state of a BUFFY is about to change
+ * mutt_sb_notify_mailbox - The state of a Buffy is about to change
  *
  * We receive a notification:
- *      After a new BUFFY has been created
- *      Before a BUFFY is deleted
+ *      After a new Buffy has been created
+ *      Before a Buffy is deleted
  *
  * Before a deletion, check that our pointers won't be invalidated.
  */
-void mutt_sb_notify_mailbox(BUFFY *b, int created)
+void mutt_sb_notify_mailbox(struct Buffy *b, int created)
 {
   int del_index;
 
@@ -1209,7 +1209,7 @@ void mutt_sb_toggle_virtual(void)
   HilIndex = -1;
   BotIndex = -1;
 
-  BUFFY *b = NULL;
+  struct Buffy *b = NULL;
 
   EntryCount = 0;
   FREE(&Entries);

diff --git a/sidebar.h b/sidebar.h
index 5212f2dd9d450fef6bcf29344db0dffd4c3e1131..150f702d6b82716dee70e929f6a29cdbfb3dce56 100644 (file)
--- a/sidebar.h
+++ b/sidebar.h
@@ -26,7 +26,7 @@
 void mutt_sb_change_mailbox(int op);
 void mutt_sb_draw(void);
 const char *mutt_sb_get_highlight(void);
-void mutt_sb_notify_mailbox(BUFFY *b, int created);
+void mutt_sb_notify_mailbox(struct Buffy *b, int created);
 void mutt_sb_set_buffystats(const CONTEXT *ctx);
 void mutt_sb_set_open_buffy(void);
 void mutt_sb_toggle_virtual(void);