{
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);
if (!progress->inc)
return;
- if (progress->flags & PROG_SIZE)
+ if (progress->flags & M_PROGRESS_SIZE)
{
if (pos >= progress->pos + (progress->inc << 10))
{
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);
#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++)
{
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 */
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,
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
{
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)
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++)
{
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);
#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++)
{
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
{
#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
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++)
}
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)
{
}
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)))
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);
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;