Rename PROG_(SIZE|MSG) to M_PROGRESS_\1.

diff --git a/curs_lib.c b/curs_lib.c
index 96c5b9b70e6de6a6304f63ec31e6cb90f3feb47f..169168ea3be9fcc26289af87fb0bbf170cc54b6c 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -353,7 +353,7 @@ void mutt_progress_update (progress_t* progress, long pos)
     {
       if (progress->size)
       {
-       if (progress->flags & PROG_SIZE)
+       if (progress->flags & M_PROGRESS_SIZE)
          mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr), progress->size);
        else
          snprintf (progress->sizestr, sizeof (progress->sizestr), "%ld", progress->size);
@@ -365,7 +365,7 @@ void mutt_progress_update (progress_t* progress, long pos)
   if (!progress->inc)
     return;
 
-  if (progress->flags & PROG_SIZE)
+  if (progress->flags & M_PROGRESS_SIZE)
   {
     if (pos >= progress->pos + (progress->inc << 10))
     {

diff --git a/imap/message.c b/imap/message.c
index 11bfcaf0b2fb95ede2b66149d325338fbeece816..586d362d6baf42bc4ab10ab161a6b6690763bffa 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -135,7 +135,7 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
   if (evalhc)
   {
     mutt_progress_init (&progress, _("Evaluating cache..."),
-                       PROG_MSG, ReadInc, msgend + 1);
+                       M_PROGRESS_MSG, ReadInc, msgend + 1);
 
     snprintf (buf, sizeof (buf),
       "UID FETCH 1:%u (UID FLAGS)", *uidnext - 1);
@@ -214,7 +214,7 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
 #endif /* USE_HCACHE */
 
   mutt_progress_init (&progress, _("Fetching message headers..."),
-                     PROG_MSG, ReadInc, msgend + 1);
+                     M_PROGRESS_MSG, ReadInc, msgend + 1);
 
   for (msgno = msgbegin; msgno <= msgend ; msgno++)
   {
@@ -458,7 +458,7 @@ int imap_fetch_message (MESSAGE *msg, CONTEXT *ctx, int msgno)
            goto bail;
          }
          mutt_progress_init (&progressbar, _("Fetching message..."),
-                             PROG_SIZE, NetInc, bytes);
+                             M_PROGRESS_SIZE, NetInc, bytes);
          if (imap_read_literal (msg->fp, idata, bytes, &progressbar) < 0)
            goto bail;
          /* pick up trailing line */
@@ -596,7 +596,7 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
   rewind (fp);
 
   mutt_progress_init (&progressbar, _("Uploading message..."),
-                     PROG_SIZE, NetInc, len);
+                     M_PROGRESS_SIZE, NetInc, len);
 
   imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
   snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox,

diff --git a/mbox.c b/mbox.c
index 2b32ba63061c9ed5b0c762d695ea43e071df297f..af3c7fb74a74f23a719f3262f976ccc3c84737b7 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -119,7 +119,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
   buf[sizeof (buf) - 1] = 0;
 
   snprintf (msgbuf, sizeof (msgbuf), _("Reading %s..."), ctx->path);
-  mutt_progress_init (&progress, msgbuf, PROG_MSG, ReadInc, 0);
+  mutt_progress_init (&progress, msgbuf, M_PROGRESS_MSG, ReadInc, 0);
 
   FOREVER
   {
@@ -269,7 +269,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
   tz = mutt_local_tz (0);
 
   snprintf (msgbuf, sizeof (msgbuf), _("Reading %s..."), ctx->path);
-  mutt_progress_init (&progress, msgbuf, PROG_MSG, ReadInc, 0);
+  mutt_progress_init (&progress, msgbuf, M_PROGRESS_MSG, ReadInc, 0);
 
   loc = ftello (ctx->fp);
   while (fgets (buf, sizeof (buf), ctx->fp) != NULL)
@@ -783,7 +783,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint)
   oldOffset = safe_calloc (ctx->msgcount - first, sizeof (struct m_update_t));
 
   snprintf (msgbuf, sizeof (msgbuf), _("Writing %s..."), ctx->path);
-  mutt_progress_init (&progress, msgbuf, PROG_MSG, WriteInc, ctx->msgcount);
+  mutt_progress_init (&progress, msgbuf, M_PROGRESS_MSG, WriteInc, ctx->msgcount);
 
   for (i = first, j = 0; i < ctx->msgcount; i++)
   {

diff --git a/mh.c b/mh.c
index ec8408e1f307b060cbc702a06a42dab242139014..1447d142f1f98b4bf6a08be32f5003ad7a85002e 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -1022,7 +1022,7 @@ int mh_read_dir (CONTEXT * ctx, const char *subdir)
 
   memset (&mhs, 0, sizeof (mhs));
   snprintf (msgbuf, sizeof (msgbuf), _("Reading %s..."), ctx->path);
-  mutt_progress_init (&progress, msgbuf, PROG_MSG, ReadInc, 0);
+  mutt_progress_init (&progress, msgbuf, M_PROGRESS_MSG, ReadInc, 0);
 
   maildir_update_mtime (ctx);
 
@@ -1524,7 +1524,7 @@ int mh_sync_mailbox (CONTEXT * ctx, int *index_hint)
 #endif /* USE_HCACHE */
 
   snprintf (msgbuf, sizeof (msgbuf), _("Writing %s..."), ctx->path);
-  mutt_progress_init (&progress, msgbuf, PROG_MSG, WriteInc, ctx->msgcount);
+  mutt_progress_init (&progress, msgbuf, M_PROGRESS_MSG, WriteInc, ctx->msgcount);
 
   for (i = 0; i < ctx->msgcount; i++)
   {

diff --git a/mutt_curses.h b/mutt_curses.h
index ac7915e4b45f2d18565050ed34831f32ae348117..94c1a69bad9d163629cd46d009df28f7bf12feb5 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -141,8 +141,8 @@ typedef struct color_line
   struct color_line *next;
 } COLOR_LINE;
 
-#define PROG_SIZE      (1<<0)  /* traffic-based progress */
-#define PROG_MSG       (1<<1)  /* message-based progress */
+#define M_PROGRESS_SIZE                (1<<0)  /* traffic-based progress */
+#define M_PROGRESS_MSG         (1<<1)  /* message-based progress */
 
 typedef struct
 {

diff --git a/pattern.c b/pattern.c
index 0a6abfc54e87b7d9369c2cfe1dac3bea1114b195..c10f92d00f3e729dbae4cc1316dd167246e1f6dd 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -1289,7 +1289,7 @@ int mutt_pattern_func (int op, char *prompt)
 #endif
 
   mutt_progress_init (&progress, _("Executing command on matching messages..."),
-                     PROG_MSG, ReadInc,
+                     M_PROGRESS_MSG, ReadInc,
                      (op == M_LIMIT) ? Context->msgcount : Context->vcount);
 
 #define THIS_BODY Context->hdrs[i]->content
@@ -1437,7 +1437,7 @@ int mutt_search_command (int cur, int op)
   if (op == OP_SEARCH_OPPOSITE)
     incr = -incr;
 
-  mutt_progress_init (&progress, _("Searching..."), PROG_MSG,
+  mutt_progress_init (&progress, _("Searching..."), M_PROGRESS_MSG,
                      ReadInc, Context->vcount);
 
   for (i = cur + incr, j = 0 ; j != Context->vcount; j++)

diff --git a/pop.c b/pop.c
index 80c7398eceec99c9f5189c6fab04e844c703b359..ba2841f106d9bd7e5ab8a8c63ecb1d6305fd2c90 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -237,7 +237,7 @@ static int pop_fetch_headers (CONTEXT *ctx)
   }
 
   mutt_progress_init (&progress, _("Fetching message headers..."),
-                     PROG_MSG, ReadInc, new_count - old_count);
+                     M_PROGRESS_MSG, ReadInc, new_count - old_count);
 
   if (ret == 0)
   {
@@ -510,7 +510,7 @@ int pop_fetch_message (MESSAGE* msg, CONTEXT* ctx, int msgno)
     }
 
     mutt_progress_init (&progressbar, _("Fetching message..."),
-                       PROG_SIZE, NetInc, h->content->length + h->content->offset - 1);
+                       M_PROGRESS_SIZE, NetInc, h->content->length + h->content->offset - 1);
 
     /* see if we can put in body cache; use our cache as fallback */
     if (!(msg->fp = mutt_bcache_put (pop_data->bcache, h->data)))
@@ -609,7 +609,7 @@ int pop_sync_mailbox (CONTEXT *ctx, int *index_hint)
       return -1;
 
     mutt_progress_init (&progress, _("Marking messages deleted..."),
-                       PROG_MSG, WriteInc, ctx->deleted);
+                       M_PROGRESS_MSG, WriteInc, ctx->deleted);
 
 #if USE_HCACHE
     hc = mutt_hcache_open (HeaderCache, ctx->path);

diff --git a/pop_lib.c b/pop_lib.c
index 7956f16bf3d6351e22eec34f75d1482515fb3392..2c133d23c5b5dcc44b1626c9782d8bba6635f678 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -551,7 +551,7 @@ int pop_reconnect (CONTEXT *ctx)
       int i;
 
       mutt_progress_init (&progressbar, _("Verifying message indexes..."),
-                         PROG_SIZE, NetInc, 0);
+                         M_PROGRESS_SIZE, NetInc, 0);
 
       for (i = 0; i < ctx->msgcount; i++)
        ctx->hdrs[i]->refno = -1;