Fix a bunch of cases where format parameters were missing from calls

to mutt_message and mutt_error.

4 files changed, 14 insertions, 20 deletions

diff --git a/imap/command.c b/imap/command.c
index 97763670..722b3973 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -150,7 +150,7 @@ int imap_exec (char* buf, size_t buflen, IMAP_DATA* idata, const char* cmd,
     pc = buf + SEQLEN;
     SKIPWS (pc);
     pc = imap_next_word (pc);
-    mutt_error (pc);
+    mutt_error ("%s", pc);
     sleep (1);
 
     return -1;
@@ -258,7 +258,7 @@ int imap_handle_untagged (IMAP_DATA *idata, char *s)
     /* server shut down our connection */
     s += 3;
     SKIPWS (s);
-    mutt_error (s);
+    mutt_error ("%s", s);
     idata->status = IMAP_BYE;
     if (idata->state == IMAP_SELECTED)
       mx_fastclose_mailbox (idata->selected_ctx);
@@ -270,7 +270,7 @@ int imap_handle_untagged (IMAP_DATA *idata, char *s)
   else if (option (OPTIMAPSERVERNOISE) && (mutt_strncasecmp ("NO", s, 2) == 0))
   {
     /* Display the warning message from the server */
-    mutt_error (s+3);
+    mutt_error ("%s", s+3);
     sleep (1);
   }
   else
diff --git a/imap/imap.c b/imap/imap.c
index 7ca19053..b4015a11 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -247,7 +247,7 @@ int imap_reopen_mailbox (CONTEXT *ctx, int *index_hint)
     char *s;
     s = imap_next_word (buf); /* skip seq */
     s = imap_next_word (s); /* Skip response */
-    mutt_error (s);
+    mutt_error ("%s", s);
     sleep (1);
     return -1;
   }
@@ -674,7 +674,7 @@ int imap_open_mailbox (CONTEXT *ctx)
     char *s;
     s = imap_next_word (buf); /* skip seq */
     s = imap_next_word (s); /* Skip response */
-    mutt_error (s);
+    mutt_error ("%s", s);
     idata->state = IMAP_AUTHENTICATED;
     sleep (1);
     return -1;
@@ -978,9 +978,7 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int *index_hint)
     /* if we have a message set, then let's delete */
     if (deleted)
     {
-      snprintf (tmp, sizeof (tmp), _("Marking %d messages deleted..."),
-        deleted);
-      mutt_message (tmp);
+      mutt_message (_("Marking %d messages deleted..."), deleted);
       snprintf (tmp, sizeof (tmp), "STORE %s +FLAGS.SILENT (\\Deleted)", buf);
       if (imap_exec (buf, sizeof (buf), CTX_DATA, tmp, 0) != 0)
         /* continue, let regular store try before giving up */
@@ -998,9 +996,7 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int *index_hint)
   {
     if (ctx->hdrs[n]->changed)
     {
-      snprintf (buf, sizeof (buf), _("Saving message status flags... [%d/%d]"),
-		n+1, ctx->msgcount);
-      mutt_message (buf);
+      mutt_message (_("Saving message status flags... [%d/%d]"), n+1, ctx->msgcount);
       
       flags[0] = '\0';
       
diff --git a/imap/message.c b/imap/message.c
index c6b46b7f..bf332f7b 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -92,9 +92,8 @@ int imap_read_headers (CONTEXT *ctx, int msgbegin, int msgend)
   h0 = h;
   for (msgno = msgbegin; msgno <= msgend ; msgno++)
   {
-    snprintf (buf, sizeof (buf), _("Fetching message headers... [%d/%d]"), 
-      msgno + 1, msgend + 1);
-    mutt_message (buf);
+    mutt_message (_("Fetching message headers... [%d/%d]"), 
+		  msgno + 1, msgend + 1);
 
     if (msgno + 1 > fetchlast)
     {
@@ -525,7 +524,7 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
     pc = buf + SEQLEN;
     SKIPWS (pc);
     pc = imap_next_word (pc);
-    mutt_error (pc);
+    mutt_error ("%s", pc);
     sleep (1);
     fclose (fp);
     return (-1);
@@ -568,7 +567,7 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
     pc = buf + SEQLEN;
     SKIPWS (pc);
     pc = imap_next_word (pc);
-    mutt_error (pc);
+    mutt_error ("%s", pc);
     sleep (1);
     return (-1);
   }
diff --git a/imap/socket.c b/imap/socket.c
index d0613156..e752bcf1 100644
--- a/imap/socket.c
+++ b/imap/socket.c
@@ -160,10 +160,9 @@ void imap_logout_all (void)
   {
     if (conn->up)
     {
-      snprintf (buf, sizeof (buf), _("Closing connection to %s..."),
-        conn->mx.host);
-      mutt_message (buf);
-
+      mutt_message (_("Closing connection to %s..."),
+		    conn->mx.host);
+      
       imap_make_sequence (seq, sizeof (seq));
       snprintf (buf, sizeof (buf), "%s LOGOUT\r\n", seq);