tidy do...while loops

diff --git a/color.c b/color.c
index 7ec9d447aa57a0b85417e0d652f7fc49913128bf..fc60fbaabf8f7c4ce28c7984002cf8ddb88a4220 100644 (file)
--- a/color.c
+++ b/color.c
@@ -685,8 +685,9 @@ static enum CommandResult parse_uncolor(struct Buffer *buf, struct Buffer *s,
   {
     /* just eat the command, but don't do anything real about it */
     do
+    {
       mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
-    while (MoreArgs(s));
+    } while (MoreArgs(s));
 
     return MUTT_CMD_SUCCESS;
   }

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index a2ecbb87225cef0b7e51eb6713d02c53ba1e0637..06d3b7d5b83b453cd0c64461eca8b447d3140f9a 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -60,8 +60,9 @@ enum ImapAuthRes imap_auth_anon(struct ImapAccountData *adata, const char *metho
   imap_cmd_start(adata, "AUTHENTICATE ANONYMOUS");
 
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_RESPOND)
   {
@@ -72,8 +73,9 @@ enum ImapAuthRes imap_auth_anon(struct ImapAccountData *adata, const char *metho
   mutt_socket_send(adata->conn, "ZHVtbXkK\r\n"); /* base64 ("dummy") */
 
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_OK)
   {

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 037b30247276cd40d6c2d49c2509d28e96b61a5a..b4947c22e9b6c27a9b21067ae885fb3adee23c81 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -121,8 +121,9 @@ enum ImapAuthRes imap_auth_cram_md5(struct ImapAccountData *adata, const char *m
    * primary host name of the server. The syntax of the unencoded form must
    * correspond to that of an RFC822 'msg-id' [RFC822] as described in [POP3].  */
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_RESPOND)
   {
@@ -163,8 +164,9 @@ enum ImapAuthRes imap_auth_cram_md5(struct ImapAccountData *adata, const char *m
   mutt_socket_send(adata->conn, ibuf);
 
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_OK)
   {

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 76743727a2175a8d27931abeebd8829c7a6cbcd0..b0f03195d812c07673145e15aad1acf5af79ed83 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -171,8 +171,9 @@ enum ImapAuthRes imap_auth_gss(struct ImapAccountData *adata, const char *method
 
   /* expect a null continuation response ("+") */
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_RESPOND)
   {
@@ -192,8 +193,9 @@ enum ImapAuthRes imap_auth_gss(struct ImapAccountData *adata, const char *method
   {
     /* Read server data */
     do
+    {
       rc = imap_cmd_step(adata);
-    while (rc == IMAP_RES_CONTINUE);
+    } while (rc == IMAP_RES_CONTINUE);
 
     if (rc != IMAP_RES_RESPOND)
     {
@@ -235,8 +237,9 @@ enum ImapAuthRes imap_auth_gss(struct ImapAccountData *adata, const char *method
 
   /* get security flags and buffer size */
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_RESPOND)
   {
@@ -304,8 +307,9 @@ enum ImapAuthRes imap_auth_gss(struct ImapAccountData *adata, const char *method
 
   /* Joy of victory or agony of defeat? */
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
   if (rc == IMAP_RES_RESPOND)
   {
     mutt_debug(LL_DEBUG1, "Unexpected server continuation request\n");
@@ -334,8 +338,9 @@ enum ImapAuthRes imap_auth_gss(struct ImapAccountData *adata, const char *method
 err_abort_cmd:
   mutt_socket_send(adata->conn, "*\r\n");
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
 bail:
   mutt_error(_("GSSAPI authentication failed"));

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index b4caa5bdda87748aa6e9f4eefb22d89ab777aec7..9235cc3d22a3861effa1367c9279b28652d10315 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -150,8 +150,9 @@ enum ImapAuthRes imap_auth_sasl(struct ImapAccountData *adata, const char *metho
   while ((rc == SASL_CONTINUE) || (olen > 0))
   {
     do
+    {
       irc = imap_cmd_step(adata);
-    while (irc == IMAP_RES_CONTINUE);
+    } while (irc == IMAP_RES_CONTINUE);
 
     if ((irc == IMAP_RES_BAD) || (irc == IMAP_RES_NO))
       goto bail;

diff --git a/imap/command.c b/imap/command.c
index cd644205b8778b748e31a156814b463fa565a846..221499dc11e84004f86cedcad11a6a3f82002d3a 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -1263,8 +1263,9 @@ int imap_exec(struct ImapAccountData *adata, const char *cmdstr, ImapCmdFlags fl
   /* Allow interruptions, particularly useful if there are network problems. */
   mutt_sig_allow_interrupt(1);
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
   mutt_sig_allow_interrupt(0);
 
   if (rc == IMAP_RES_NO)
@@ -1372,8 +1373,9 @@ int imap_cmd_idle(struct ImapAccountData *adata)
   }
 
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc == IMAP_RES_RESPOND)
   {

diff --git a/imap/message.c b/imap/message.c
index b6e5b0e115967ef7e7c97a1dffcc0be684c99f15..754c2c003033337dc5488b6defefc15a9195c2f6 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -1509,8 +1509,9 @@ int imap_append_message(struct Mailbox *m, struct Message *msg)
   imap_cmd_start(adata, buf);
 
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_RESPOND)
     goto cmd_step_fail;
@@ -1540,8 +1541,9 @@ int imap_append_message(struct Mailbox *m, struct Message *msg)
   mutt_file_fclose(&fp);
 
   do
+  {
     rc = imap_cmd_step(adata);
-  while (rc == IMAP_RES_CONTINUE);
+  } while (rc == IMAP_RES_CONTINUE);
 
   if (rc != IMAP_RES_OK)
     goto cmd_step_fail;

diff --git a/recvattach.c b/recvattach.c
index 89be6427c2b58e147475a59b6e94d14c96e0b56a..a4c97b6d3acdbd0efad1d310a18ee6ef1822e11f 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -126,8 +126,9 @@ static void mutt_update_v2r(struct AttachCtx *actx)
     {
       curlevel = actx->idx[rindex]->level;
       do
+      {
         rindex++;
-      while ((rindex < actx->idxlen) && (actx->idx[rindex]->level > curlevel));
+      } while ((rindex < actx->idxlen) && (actx->idx[rindex]->level > curlevel));
     }
     else
       rindex++;

diff --git a/system.c b/system.c
index 9efb15411c6f5c86d5dcef37438762bc8569bb88..130ec7f02ccbdb649adbe3466ad3f0a3fb931b6a 100644 (file)
--- a/system.c
+++ b/system.c
@@ -30,8 +30,8 @@
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/wait.h> // IWYU pragma: keep
 #include <unistd.h>
-#include <sys/wait.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #ifdef USE_IMAP