tidy: sort out ++ -- comma operators

Where possible:
- Change pre- to post-decrement
- Change pre- to post-increment
- Drop commas (separate statements)

diff --git a/browser.c b/browser.c
index 5b8ee074deffc9f82d464a9f97e29e00253cd3ed..1249f4bf2069dee9e268fb6593ce7fc120feac49 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -302,7 +302,7 @@ static const char *folder_format_str(char *dest, size_t destlen, size_t col, int
           t_fmt = NONULL(DateFmt);
           if (*t_fmt == '!')
           {
-            ++t_fmt;
+            t_fmt++;
             do_locales = false;
           }
         }

diff --git a/charset.c b/charset.c
index 0ea8177c532207a808af20d04fd51e40672fa392..ffa123ea0d1c2f590308e26a15d1b91db5202fb4 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -391,9 +391,11 @@ size_t mutt_iconv(iconv_t cd, ICONV_CONST char **inbuf, size_t *inbytesleft,
           iconv(cd, &ib1, &ibl1, &ob1, &obl1);
           if (!ibl1)
           {
-            ++ib, --ibl;
-            ob = ob1, obl = obl1;
-            ++ret;
+            ib++;
+            ibl--;
+            ob = ob1;
+            obl = obl1;
+            ret++;
             break;
           }
         }
@@ -413,15 +415,19 @@ size_t mutt_iconv(iconv_t cd, ICONV_CONST char **inbuf, size_t *inbytesleft,
           n = 1;
         }
         memcpy(ob, outrepl, n);
-        ++ib, --ibl;
-        ob += n, obl -= n;
-        ++ret;
+        ib++;
+        ibl--;
+        ob += n;
+        obl -= n;
+        ret++;
         iconv(cd, 0, 0, 0, 0); /* for good measure */
         continue;
       }
     }
-    *inbuf = ib, *inbytesleft = ibl;
-    *outbuf = ob, *outbytesleft = obl;
+    *inbuf = ib;
+    *inbytesleft = ibl;
+    *outbuf = ob;
+    *outbytesleft = obl;
     return ret;
   }
 }
@@ -458,7 +464,8 @@ int mutt_convert_string(char **ps, const char *from, const char *to, int flags)
       outrepl = "?";
 
     len = strlen(s);
-    ib = s, ibl = len + 1;
+    ib = s;
+    ibl = len + 1;
     obl = MB_LEN_MAX * ibl;
     ob = buf = safe_malloc(obl + 1);
 

diff --git a/curs_lib.c b/curs_lib.c
index 4740477b36ad16b088728fda0743795c48044bca..d42ace32a8a432b0893fd01ca027f5a6a0bbf2a3 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -1159,7 +1159,7 @@ void mutt_simple_format(char *dest, size_t destlen, int min_width, int max_width
 
   memset(&mbstate1, 0, sizeof(mbstate1));
   memset(&mbstate2, 0, sizeof(mbstate2));
-  --destlen;
+  destlen--;
   p = dest;
   for (; n && (k = mbrtowc(&wc, s, n, &mbstate1)); s += k, n -= k)
   {
@@ -1264,9 +1264,15 @@ static void format_s_x(char *dest, size_t destlen, const char *prefix,
   int max_width = INT_MAX;
 
   if (*prefix == '-')
-    ++prefix, justify = FMT_LEFT;
+  {
+    prefix++;
+    justify = FMT_LEFT;
+  }
   else if (*prefix == '=')
-    ++prefix, justify = FMT_CENTER;
+  {
+    prefix++;
+    justify = FMT_CENTER;
+  }
   min_width = strtol(prefix, &p, 10);
   if (*p == '.')
   {

diff --git a/doc/makedoc.c b/doc/makedoc.c
index 59e1fcf189d8dbf88ad0fe147aa1db54c9369902..b5e109fcf5912c21b89836814b425062950c31d8 100644 (file)
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -272,7 +272,7 @@ static int print_it(int special, char *str, FILE *out, int docstat)
             docstat |= D_NL;
           }
           if (docstat & D_DL)
-            ++Continuation;
+            Continuation++;
           break;
         }
         case SP_NEWPAR:
@@ -907,11 +907,11 @@ static int handle_docline(char *l, FILE *out, int docstat)
       char *ref = NULL;
       char save;
 
-      ++s;
+      s++;
       if (*s == '$')
       {
         output_dollar = true;
-        ++s;
+        s++;
       }
       if (*s == '$')
       {
@@ -921,14 +921,14 @@ static int handle_docline(char *l, FILE *out, int docstat)
       {
         ref = s;
         while (isalnum((unsigned char) *s) || (*s && strchr("-_<>", *s)))
-          ++s;
+          s++;
 
         docstat = commit_buff(buff, &d, out, docstat);
         save = *s;
         *s = 0;
         print_ref(out, output_dollar, ref);
         *s = save;
-        --s;
+        s--;
       }
     }
     else

diff --git a/enter.c b/enter.c
index ec2b132d42fd20d349035ce7be76b9b25cd35eaa..1a349773281d4ff939641fb5546d8b7664abafec 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -142,7 +142,8 @@ static size_t my_mbstowcs(wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *buf
   wchar_t *wbuf = NULL;
   size_t wbuflen;
 
-  wbuf = *pwbuf, wbuflen = *pwbuflen;
+  wbuf = *pwbuf;
+  wbuflen = *pwbuflen;
 
   while (*buf)
   {
@@ -169,7 +170,8 @@ static size_t my_mbstowcs(wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *buf
       buf++;
     }
   }
-  *pwbuf = wbuf, *pwbuflen = wbuflen;
+  *pwbuf = wbuf;
+  *pwbuflen = wbuflen;
   return i;
 }
 
@@ -391,9 +393,9 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
           {
             i = state->curpos;
             while (i && COMB_CHAR(state->wbuf[i - 1]))
-              --i;
+              i--;
             if (i)
-              --i;
+              i--;
             memmove(state->wbuf + i, state->wbuf + state->curpos,
                     (state->lastchar - state->curpos) * sizeof(wchar_t));
             state->lastchar -= state->curpos - i;
@@ -434,10 +436,10 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
             BEEP();
           else
           {
-            ++state->curpos;
+            state->curpos++;
             while (state->curpos < state->lastchar &&
                    COMB_CHAR(state->wbuf[state->curpos]))
-              ++state->curpos;
+              state->curpos++;
           }
           break;
 
@@ -447,9 +449,9 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
           else
           {
             while (state->curpos && iswspace(state->wbuf[state->curpos - 1]))
-              --state->curpos;
+              state->curpos--;
             while (state->curpos && !iswspace(state->wbuf[state->curpos - 1]))
-              --state->curpos;
+              state->curpos--;
           }
           break;
 
@@ -459,10 +461,10 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
           else
           {
             while (state->curpos < state->lastchar && iswspace(state->wbuf[state->curpos]))
-              ++state->curpos;
+              state->curpos++;
             while (state->curpos < state->lastchar &&
                    !iswspace(state->wbuf[state->curpos]))
-              ++state->curpos;
+              state->curpos++;
           }
           break;
 
@@ -475,9 +477,9 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
             break;
           }
           while (state->curpos && !iswspace(state->wbuf[state->curpos]))
-            --state->curpos;
+            state->curpos--;
           while (state->curpos < state->lastchar && iswspace(state->wbuf[state->curpos]))
-            ++state->curpos;
+            state->curpos++;
           while (state->curpos < state->lastchar && !iswspace(state->wbuf[state->curpos]))
           {
             if (ch == OP_EDITOR_DOWNCASE_WORD)
@@ -499,11 +501,11 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
           {
             i = state->curpos;
             while (i < state->lastchar && COMB_CHAR(state->wbuf[i]))
-              ++i;
+              i++;
             if (i < state->lastchar)
-              ++i;
+              i++;
             while (i < state->lastchar && COMB_CHAR(state->wbuf[i]))
-              ++i;
+              i++;
             memmove(state->wbuf + state->curpos, state->wbuf + i,
                     (state->lastchar - i) * sizeof(wchar_t));
             state->lastchar -= i - state->curpos;
@@ -516,7 +518,7 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
           {
             i = state->curpos;
             while (i && iswspace(state->wbuf[i - 1]))
-              --i;
+              i--;
             if (i)
             {
               if (iswalnum(state->wbuf[i - 1]))
@@ -525,7 +527,7 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
                   ;
               }
               else
-                --i;
+                i--;
             }
             memmove(state->wbuf + i, state->wbuf + state->curpos,
                     (state->lastchar - state->curpos) * sizeof(wchar_t));
@@ -554,7 +556,7 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
             else
             {
               /* skip over one non-alphanumeric character */
-              ++i;
+              i++;
             }
           }
 
@@ -770,7 +772,7 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl
             if (state->curpos == 0)
               state->curpos = 2;
             else if (state->curpos < state->lastchar)
-              ++state->curpos;
+              state->curpos++;
 
             t = state->wbuf[state->curpos - 2];
             state->wbuf[state->curpos - 2] = state->wbuf[state->curpos - 1];

diff --git a/flags.c b/flags.c
index e7d1afcfe0877eb59234d7eb4a4bd4b6b6895dbd..7c92c394f41eab4fcd6d1613339bff96d7ae34bc 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -131,7 +131,7 @@ void _mutt_set_flag(struct Context *ctx, struct Header *h, int flag, int bf, int
           update = true;
           h->old = false;
           if (upd_ctx)
-            ctx->new ++;
+            ctx->new++;
           if (h->read)
           {
             h->read = false;
@@ -148,7 +148,7 @@ void _mutt_set_flag(struct Context *ctx, struct Header *h, int flag, int bf, int
         update = true;
         if (!h->old)
           if (upd_ctx)
-            ctx->new --;
+            ctx->new--;
         h->read = true;
         if (upd_ctx)
           ctx->unread--;
@@ -171,7 +171,7 @@ void _mutt_set_flag(struct Context *ctx, struct Header *h, int flag, int bf, int
           h->old = true;
           if (!h->read)
             if (upd_ctx)
-              ctx->new --;
+              ctx->new--;
           h->changed = true;
           if (upd_ctx)
             ctx->changed = true;
@@ -183,7 +183,7 @@ void _mutt_set_flag(struct Context *ctx, struct Header *h, int flag, int bf, int
         h->old = false;
         if (!h->read)
           if (upd_ctx)
-            ctx->new ++;
+            ctx->new++;
         h->changed = true;
         if (upd_ctx)
           ctx->changed = true;
@@ -205,7 +205,7 @@ void _mutt_set_flag(struct Context *ctx, struct Header *h, int flag, int bf, int
             ctx->unread--;
           if (!h->old)
             if (upd_ctx)
-              ctx->new --;
+              ctx->new--;
           h->changed = true;
           if (upd_ctx)
             ctx->changed = true;
@@ -219,7 +219,7 @@ void _mutt_set_flag(struct Context *ctx, struct Header *h, int flag, int bf, int
           ctx->unread++;
         if (!h->old)
           if (upd_ctx)
-            ctx->new ++;
+            ctx->new++;
         h->changed = true;
         if (upd_ctx)
           ctx->changed = true;
@@ -244,7 +244,7 @@ void _mutt_set_flag(struct Context *ctx, struct Header *h, int flag, int bf, int
               ctx->unread--;
             if (!h->old)
               if (upd_ctx)
-                ctx->new --;
+                ctx->new--;
           }
           h->changed = true;
           if (upd_ctx)

diff --git a/handler.c b/handler.c
index 1e1f7bf4611a023196c59649b4037b2159f6fbda..f16162f7905c87f7ac210e52c12d36ed0b72ac3b 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -114,7 +114,8 @@ static void convert_to_state(iconv_t cd, char *bufi, size_t *l, struct State *s)
     return;
   }
 
-  ib = bufi, ibl = *l;
+  ib = bufi;
+  ibl = *l;
   for (;;)
   {
     ob = bufo, obl = sizeof(bufo);

diff --git a/headers.c b/headers.c
index 3b5b4a4b8c36016cda87ee506865d1d887a5c462..7c29cb2d9219e8e429e43f755def9829143d142c 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -315,7 +315,7 @@ int mutt_label_message(struct Header *hdr)
   {
     if (label_message(Context, hdr, new))
     {
-      ++changed;
+      changed++;
       mutt_set_header_color(Context, hdr);
     }
   }
@@ -327,7 +327,7 @@ int mutt_label_message(struct Header *hdr)
       if (HDR_OF(i)->tagged)
         if (label_message(Context, HDR_OF(i), new))
         {
-          ++changed;
+          changed++;
           mutt_set_flag(Context, HDR_OF(i), MUTT_TAG, 0);
           /* mutt_set_flag re-evals the header color */
         }

diff --git a/help.c b/help.c
index 2a0e46fe2a1cc21b0faf635a5be7b262c5566851..b5c3a90e9d007cc8dec71b6ae8d565ee05344e56 100644 (file)
--- a/help.c
+++ b/help.c
@@ -279,7 +279,7 @@ static void format_line(FILE *f, int ismacro, const char *t1, const char *t2, co
         {
           n += col - MuttIndexWindow->cols;
           if (option(OPTMARKERS))
-            ++n;
+            n++;
         }
         col = pad(f, n, col_b);
       }

diff --git a/imap/utf7.c b/imap/utf7.c
index 220271ed4c332738e79dbb8c03cc297b3cfa2a69..05cc264a679cd45bb0c540d1016f02e1b211a4eb 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -73,7 +73,8 @@ static char *utf7_to_utf8(const char *u7, size_t u7len, char **u8, size_t *u8len
   {
     if (*u7 == '&')
     {
-      u7++, u7len--;
+      u7++;
+      u7len--;
 
       if (u7len && *u7 == '-')
       {
@@ -172,23 +173,42 @@ static char *utf8_to_utf7(const char *u8, size_t u8len, char **u7, size_t *u7len
     unsigned char c = *u8;
 
     if (c < 0x80)
-      ch = c, n = 0;
+    {
+      ch = c;
+      n = 0;
+    }
     else if (c < 0xc2)
       goto bail;
     else if (c < 0xe0)
-      ch = c & 0x1f, n = 1;
+    {
+      ch = c & 0x1f;
+      n = 1;
+    }
     else if (c < 0xf0)
-      ch = c & 0x0f, n = 2;
+    {
+      ch = c & 0x0f;
+      n = 2;
+    }
     else if (c < 0xf8)
-      ch = c & 0x07, n = 3;
+    {
+      ch = c & 0x07;
+      n = 3;
+    }
     else if (c < 0xfc)
-      ch = c & 0x03, n = 4;
+    {
+      ch = c & 0x03;
+      n = 4;
+    }
     else if (c < 0xfe)
-      ch = c & 0x01, n = 5;
+    {
+      ch = c & 0x01;
+      n = 5;
+    }
     else
       goto bail;
 
-    u8++, u8len--;
+    u8++;
+    u8len--;
     if (n > u8len)
       goto bail;
     for (i = 0; i < n; i++)
@@ -199,7 +219,8 @@ static char *utf8_to_utf7(const char *u8, size_t u8len, char **u7, size_t *u7len
     }
     if (n > 1 && !(ch >> (n * 5 + 1)))
       goto bail;
-    u8 += n, u8len -= n;
+    u8 += n;
+    u8len -= n;
 
     if (ch < 0x20 || ch >= 0x7f)
     {

diff --git a/init.c b/init.c
index 7a0413a4e331c833a9b95f40f422b7d7eb8d2c98..9905c34ecf9dab834b065e7cfe17ffb6b4e1658e 100644 (file)
--- a/init.c
+++ b/init.c
@@ -861,7 +861,7 @@ static int remove_from_replace_list(struct ReplaceList **list, const char *pat)
       FREE(&cur->template);
       FREE(&cur);
       cur = prev->next;
-      ++nremoved;
+      nremoved++;
     }
     else
       cur = cur->next;
@@ -940,10 +940,10 @@ static int add_to_replace_list(struct ReplaceList **list, const char *pat,
       if (n > t->nmatch)
         t->nmatch = n;
       while (*p && isdigit((int) *p))
-        ++p;
+        p++;
     }
     else
-      ++p;
+      p++;
   }
 
   if (t->nmatch > t->rx->rx->re_nsub)
@@ -1601,7 +1601,7 @@ static int parse_attach_list(struct Buffer *buf, struct Buffer *s,
     if ((p = strchr(a->major, '/')))
     {
       *p = '\0';
-      ++p;
+      p++;
       a->minor = p;
     }
     else
@@ -1673,7 +1673,7 @@ static int parse_unattach_list(struct Buffer *buf, struct Buffer *s,
     if ((minor = strchr(tmp, '/')))
     {
       *minor = '\0';
-      ++minor;
+      minor++;
     }
     else
     {

diff --git a/keymap.c b/keymap.c
index cd127ce8346ade34a0b60d003aff4929459d11b0..d47d4c8504e074be952a27fe76112dfc4cceef8a 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -174,7 +174,7 @@ static int parse_keycode(const char *s)
   long int result = strtol(s + 1, &endChar, 8);
   /* allow trailing whitespace, eg.  < 1001 > */
   while (ISSPACE(*endChar))
-    ++endChar;
+    endChar++;
   /* negative keycodes don't make sense, also detect overflow */
   if (*endChar != '>' || result < 0 || result == LONG_MAX)
   {
@@ -998,7 +998,7 @@ char *parse_keymap(int *menu, struct Buffer *s, int maxmenus, int *nummenus, str
         snprintf(err->data, err->dsize, _("%s: no such menu"), p);
         goto error;
       }
-      ++i;
+      i++;
       if (q)
         p = q + 1;
       else

diff --git a/lib/md5.c b/lib/md5.c
index 6d3ed5d5545aee1e1b57549ddd43f9762b3f4914..787f25ed625f107f5695dd18a5b13bf26a4325e5 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -131,7 +131,7 @@ void *md5_finish_ctx(struct Md5Ctx *ctx, void *resbuf)
   /* Now count remaining bytes. */
   ctx->total[0] += bytes;
   if (ctx->total[0] < bytes)
-    ++ctx->total[1];
+    ctx->total[1]++;
 
   /* Put the 64-bit file length in *bits* at the end of the buffer. */
   ctx->buffer[size - 2] = SWAP(ctx->total[0] << 3);
@@ -348,7 +348,7 @@ void md5_process_block(const void *buffer, size_t len, struct Md5Ctx *ctx)
    * double word increment. */
   ctx->total[0] += len;
   if (ctx->total[0] < len)
-    ++ctx->total[1];
+    ctx->total[1]++;
 
   /* Process all bytes in the buffer with 64 bytes in each round of the loop. */
   while (words < endp)
@@ -370,7 +370,7 @@ void md5_process_block(const void *buffer, size_t len, struct Md5Ctx *ctx)
   do                                                                           \
   {                                                                            \
     a += FF(b, c, d) + (*cwp++ = SWAP(*words)) + T;                            \
-    ++words;                                                                   \
+    words++;                                                                   \
     CYCLIC(a, s);                                                              \
     a += b;                                                                    \
   } while (0)

diff --git a/mbyte.c b/mbyte.c
index a1bd0b45562ae9aa7d47b376ed82c317c77f5a71..0a3e1d621c3a1ee557d96475c300ec92de32e898 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -145,7 +145,9 @@ static size_t utf8rtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *_ps)
       errno = EILSEQ;
       return (size_t) -1;
     }
-    ++s, --n, ++k;
+    s++;
+    n--;
+    k++;
   }
   else
   {
@@ -166,7 +168,8 @@ static size_t utf8rtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *_ps)
         *ps = 0;
         return wc ? k : 0;
       }
-      --count, --wc;
+      count--;
+      wc--;
       if (!(wc >> (11 + count * 5)))
       {
         errno = count < 4 ? EILSEQ : EINVAL;
@@ -296,14 +299,14 @@ static size_t mbrtowc_iconv(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps
     {
       if (ib + ibl < ibmax)
         /* try using more input */
-        ++ibl;
+        ibl++;
       else if (k && ib > bufi + k && bufi + k + n > ibmax)
       {
         /* switch to using real input */
         ib = (ICONV_CONST char *) s + (ib - bufi - k);
         ibmax = (ICONV_CONST char *) s + n;
         k = 0;
-        ++ibl;
+        ibl++;
       }
       else
       {

diff --git a/menu.c b/menu.c
index 811d6f0554ecc02bc3dabf8e14f1c6b236f0eb62..b9d0fbdd10ed53008fa5d4b354c40b7a246cb092 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -229,7 +229,8 @@ static void print_enriched_string(int index, int attr, unsigned char *s, int do_
             addch('?');
             break;
         }
-        s++, n--;
+        s++;
+        n--;
       }
       if (do_color)
         ATTRSET(attr);
@@ -261,7 +262,8 @@ static void print_enriched_string(int index, int attr, unsigned char *s, int do_
     else if ((k = mbrtowc(&wc, (char *) s, n, &mbstate)) > 0)
     {
       addnstr((char *) s, k);
-      s += k, n -= k;
+      s += k;
+      n -= k;
     }
     else
       break;

diff --git a/mutt_lua.c b/mutt_lua.c
index 4121cfe1dd62c9ff27fe7a08a5121c587d1aa102..9951bd05e5fd1510bd75c7eb777a35ff3b1b8d1e 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -105,7 +105,7 @@ static int _lua_mutt_call(lua_State *l)
     if (lua_pushstring(l, err.data) == NULL)
       _handle_error(l);
     else
-      ++rv;
+      rv++;
   }
 
   FREE(&err.data);
@@ -286,7 +286,7 @@ static int _lua_mutt_enter(lua_State *l)
     if (lua_pushstring(l, err.data) == NULL)
       _handle_error(l);
     else
-      ++rv;
+      rv++;
   }
 
   FREE(&buffer);

diff --git a/muttlib.c b/muttlib.c
index 41816dd1a1e18272fb7f9b96f3e2c84c169e925e..0c0bae79235b95a04f327ac80661e498928e8761 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -119,7 +119,7 @@ void mutt_adv_mktemp(char *s, size_t l)
     if ((suffix = strrchr(prefix, '.')) != NULL)
     {
       *suffix = 0;
-      ++suffix;
+      suffix++;
     }
     mutt_mktemp_pfx_sfx(s, l, prefix, suffix);
   }
@@ -1232,7 +1232,7 @@ char *mutt_apply_replace(char *dbuf, size_t dlen, char *sbuf, struct ReplaceList
             {
               n = strtoul(p, &p, 10);             /* get subst number */
               while (isdigit((unsigned char) *p)) /* skip subst token */
-                ++p;
+                p++;
               for (i = pmatch[n].rm_so;
                    (i < pmatch[n].rm_eo) && (tlen < LONG_STRING - 1); i++)
                 dst[tlen++] = src[i];
@@ -1378,7 +1378,7 @@ void mutt_expando_format(char *dest, size_t destlen, size_t col, int cols,
            * To literally end with "%", use "%%". */
           if ((n > 0) && dest[n - 1] == '%')
           {
-            --n;
+            n--;
             dest[n] = '\0'; /* remove '%' */
             if ((n > 0) && dest[n - 1] != '%')
             {
@@ -2091,7 +2091,7 @@ bool mutt_match_spam_list(const char *s, struct ReplaceList *l, char *text, int
           char *e = NULL; /* used as pointer to end of integer backreference in strtol() call */
           int n;
 
-          ++p; /* skip over % char */
+          p++; /* skip over % char */
           n = strtol(p, &e, 10);
           /* Ensure that the integer conversion succeeded (e!=p) and bounds check.  The upper bound check
            * should not strictly be necessary since add_to_spam_list() finds the largest value, and

diff --git a/mx.c b/mx.c
index 63e554566443f8077304c4b3ded3dce073fa74a1..b0417f4050e7db4703040de2ed4e3b5cd37f8d31 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1092,7 +1092,7 @@ void mx_update_tables(struct Context *ctx, int committing)
       {
         ctx->unread++;
         if (!ctx->hdrs[j]->old)
-          ctx->new ++;
+          ctx->new++;
       }
 
       j++;
@@ -1484,7 +1484,7 @@ void mx_update_context(struct Context *ctx, int new_messages)
     {
       ctx->unread++;
       if (!h->old)
-        ctx->new ++;
+        ctx->new++;
     }
   }
 }

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index e7af1004aa298beeb73658c26ceb8c55235acd85..b83ac44831a91f6a6f5d6f84690723c06068d10f 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -1078,7 +1078,7 @@ const char *crypt_get_fingerprint_or_id(char *p, const char **pphint,
     c = *(s1++);
     if (('0' <= c && c <= '9') || ('A' <= c && c <= 'F') || ('a' <= c && c <= 'f'))
     {
-      ++hexdigits;
+      hexdigits++;
       if (isid == 2)
         isid = 1; /* it is an ID so far */
     }

diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index 5310ed8385f872f639c3ab70e1c40afb775bed14..991e53abf411dfc7e36a43a618c5f8c5e8841daf 100644 (file)
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -99,7 +99,10 @@ static void fix_uid(char *uid)
     size_t ibl, obl;
 
     buf = safe_malloc(n + 1);
-    ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
+    ib = uid;
+    ibl = d - uid + 1;
+    ob = buf;
+    obl = n;
     iconv(cd, &ib, &ibl, &ob, &obl);
     if (!ibl)
     {

diff --git a/parse.c b/parse.c
index f43a19ca07dd228e78b20727d5f64e56ca69cbfe..db7bede53b2f1a660d9b9371e94055c5bda821de 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -179,7 +179,7 @@ static struct Parameter *parse_parameters(const char *s)
       i = p - s;
       /* remove whitespace from the end of the attribute name */
       while (i > 0 && is_email_wsp(s[i - 1]))
-        --i;
+        i--;
 
       /* the check for the missing parameter token is here so that we can skip
        * over any quoted value that may be present.
@@ -1137,7 +1137,7 @@ int mutt_parse_rfc822_line(struct Envelope *e, struct Header *hdr, char *line,
           char *beg = NULL, *end = NULL;
           for (beg = strchr(p, '<'); beg; beg = strchr(end, ','))
           {
-            ++beg;
+            beg++;
             if (!(end = strchr(beg, '>')))
               break;
 

diff --git a/rfc2047.c b/rfc2047.c
index 98283c617dd664e8e97a5c0181273c58d9ca3b53..cba42b03e5ae9ec71413b3f07600c5769a0ea3b2 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -193,9 +193,12 @@ static size_t b_encoder(char *s, ICONV_CONST char *d, size_t dlen, const char *t
 {
   char *s0 = s;
 
-  memcpy(s, "=?", 2), s += 2;
-  memcpy(s, tocode, strlen(tocode)), s += strlen(tocode);
-  memcpy(s, "?B?", 3), s += 3;
+  memcpy(s, "=?", 2);
+  s += 2;
+  memcpy(s, tocode, strlen(tocode));
+  s += strlen(tocode);
+  memcpy(s, "?B?", 3);
+  s += 3;
 
   while (dlen)
   {
@@ -211,7 +214,8 @@ static size_t b_encoder(char *s, ICONV_CONST char *d, size_t dlen, const char *t
     d += in_len;
   }
 
-  memcpy(s, "?=", 2), s += 2;
+  memcpy(s, "?=", 2);
+  s += 2;
   return s - s0;
 }
 
@@ -220,9 +224,12 @@ static size_t q_encoder(char *s, ICONV_CONST char *d, size_t dlen, const char *t
   static const char hex[] = "0123456789ABCDEF";
   char *s0 = s;
 
-  memcpy(s, "=?", 2), s += 2;
-  memcpy(s, tocode, strlen(tocode)), s += strlen(tocode);
-  memcpy(s, "?Q?", 3), s += 3;
+  memcpy(s, "=?", 2);
+  s += 2;
+  memcpy(s, tocode, strlen(tocode));
+  s += strlen(tocode);
+  memcpy(s, "?Q?", 3);
+  s += 3;
   while (dlen--)
   {
     unsigned char c = *d++;
@@ -237,7 +244,8 @@ static size_t q_encoder(char *s, ICONV_CONST char *d, size_t dlen, const char *t
     else
       *s++ = c;
   }
-  memcpy(s, "?=", 2), s += 2;
+  memcpy(s, "?=", 2);
+  s += 2;
   return s - s0;
 }
 
@@ -273,7 +281,10 @@ static size_t try_block(ICONV_CONST char *d, size_t dlen, const char *fromcode,
   {
     cd = mutt_iconv_open(tocode, fromcode, 0);
     assert(cd != (iconv_t)(-1));
-    ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - strlen(tocode);
+    ib = d;
+    ibl = dlen;
+    ob = buf1;
+    obl = sizeof(buf1) - strlen(tocode);
     if (iconv(cd, &ib, &ibl, &ob, &obl) == (size_t)(-1) ||
         iconv(cd, 0, 0, &ob, &obl) == (size_t)(-1))
     {
@@ -298,7 +309,7 @@ static size_t try_block(ICONV_CONST char *d, size_t dlen, const char *fromcode,
     unsigned char c = *p;
     assert(strchr(MimeSpecials, '?'));
     if (c >= 0x7f || c < 0x20 || *p == '_' || (c != ' ' && strchr(MimeSpecials, *p)))
-      ++count;
+      count++;
   }
 
   len = ENCWORD_LEN_MIN - 2 + strlen(tocode);
@@ -350,7 +361,10 @@ static size_t encode_block(char *s, char *d, size_t dlen, const char *fromcode,
   {
     cd = mutt_iconv_open(tocode, fromcode, 0);
     assert(cd != (iconv_t)(-1));
-    ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - strlen(tocode);
+    ib = d;
+    ibl = dlen;
+    ob = buf1;
+    obl = sizeof(buf1) - strlen(tocode);
     n1 = iconv(cd, &ib, &ibl, &ob, &obl);
     n2 = iconv(cd, 0, 0, &ob, &obl);
     assert(n1 != (size_t)(-1) && n2 != (size_t)(-1));
@@ -386,7 +400,7 @@ static size_t choose_block(char *d, size_t dlen, int col, const char *fromcode,
     assert(n > 0);
     if (utf8)
       while (n > 1 && CONTINUATION_BYTE(d[n]))
-        --n;
+        n--;
   }
   return n;
 }
@@ -474,7 +488,10 @@ static int rfc2047_encode(ICONV_CONST char *d, size_t dlen, int col, const char
     if ((tocode1 = mutt_choose_charset(icode, charsets, u, ulen, 0, 0)))
       tocode = tocode1;
     else
-      ret = 2, icode = 0;
+    {
+      ret = 2;
+      icode = 0;
+    }
   }
 
   /* Hack to avoid labelling 8-bit data as us-ascii. */
@@ -496,7 +513,7 @@ static int rfc2047_encode(ICONV_CONST char *d, size_t dlen, int col, const char
     t = t0 + 1;
     if (icode)
       while (t < u + ulen && CONTINUATION_BYTE(*t))
-        ++t;
+        t++;
     if (!try_block(t0, t - t0, icode, tocode, &encoder, &wlen) &&
         col + (t0 - u) + wlen <= ENCWORD_LEN_MAX + 1)
       break;
@@ -510,7 +527,7 @@ static int rfc2047_encode(ICONV_CONST char *d, size_t dlen, int col, const char
     t = t1 - 1;
     if (icode)
       while (CONTINUATION_BYTE(*t))
-        --t;
+        t--;
     if (!try_block(t, t1 - t, icode, tocode, &encoder, &wlen) &&
         1 + wlen + (u + ulen - t1) <= ENCWORD_LEN_MAX + 1)
       break;
@@ -539,7 +556,7 @@ static int rfc2047_encode(ICONV_CONST char *d, size_t dlen, int col, const char
       n = t1 - t - 1;
       if (icode)
         while (CONTINUATION_BYTE(t[n]))
-          --n;
+          n--;
       assert(t + n >= t);
       if (!n)
       {
@@ -750,7 +767,7 @@ static const char *find_encoded_word(const char *s, const char **x)
       ;
     if (q[0] != '?' || q[1] != '=')
     {
-      --q;
+      q--;
       continue;
     }
 
@@ -838,7 +855,11 @@ void rfc2047_decode(char **pd)
         if (found_encoded && (m = lwslen(s, n)) != 0)
         {
           if (m != n)
-            *d = ' ', d++, dlen--;
+          {
+            *d = ' ';
+            d++;
+            dlen--;
+          }
           s += m;
         }
       }
@@ -872,8 +893,13 @@ void rfc2047_decode(char **pd)
         if (found_encoded && (m = lwslen(s, n)) != 0)
         {
           if (m != n)
-            *d = ' ', d++, dlen--;
-          n -= m, s += m;
+          {
+            *d = ' ';
+            d++;
+            dlen--;
+          }
+          n -= m;
+          s += m;
         }
 
         if ((m = n - lwsrlen(s, n)) != 0)
@@ -884,7 +910,11 @@ void rfc2047_decode(char **pd)
           d += m;
           dlen -= m;
           if (m != n)
-            *d = ' ', d++, dlen--;
+          {
+            *d = ' ';
+            d++;
+            dlen--;
+          }
         }
       }
       else if (!found_encoded || strspn(s, " \t\r\n") != n)

diff --git a/rfc2231.c b/rfc2231.c
index f922c983a20fda42727c01dc422b7a8d1c0b3a85..a1ebe9b6c449226d635e137d39da0db9bff0c0a3 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -335,10 +335,15 @@ int rfc2231_encode_string(char **pd)
     encode = 1;
 
   for (s = d, slen = dlen; slen; s++, slen--)
+  {
     if (*s < 0x20 || *s >= 0x7f)
-      encode = 1, ++ext;
+    {
+      encode = 1;
+      ext++;
+    }
     else if (strchr(MimeSpecials, *s) || strchr("*'%", *s))
-      ++ext;
+      ext++;
+  }
 
   if (encode)
   {

diff --git a/rfc3676.c b/rfc3676.c
index f931d7012a4b59c68438f725628026cda9dcc2cf..c0052220de29347c9e196fbd1d2e0aeeed0e2c7d 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -170,14 +170,14 @@ static int quote_width(struct State *s, int ql)
      * guidelines */
     if (width > FLOWED_MAX)
       width = FLOWED_MAX;
-    ++ql; /* When replying, we will add an additional quote level */
+    ql++; /* When replying, we will add an additional quote level */
   }
   /* adjust the paragraph width subtracting the number of prefix chars */
   width -= space_quotes(s) ? ql * 2 : ql;
   /* When displaying (not replying), there may be a space between the prefix
    * string and the paragraph */
   if (add_quote_suffix(s, ql))
-    --width;
+    width--;
   /* failsafe for really long quotes */
   if (width <= 0)
     width = FLOWED_MAX; /* arbitrary, since the line will wrap */

diff --git a/sendlib.c b/sendlib.c
index 7da09c05a28deeca89c55a3ec2e19367fbe9fc21..49702dc5667381e856dcf906e317527a116cde1a 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -695,8 +695,11 @@ static size_t convert_file_to(FILE *file, const char *fromcode, int ncodes,
     if (ascii_strcasecmp(tocodes[i], "utf-8") != 0)
       cd[i] = mutt_iconv_open(tocodes[i], "utf-8", 0);
     else
+    {
       /* Special case for conversion to UTF-8 */
-      cd[i] = (iconv_t)(-1), score[i] = (size_t)(-1);
+      cd[i] = (iconv_t)(-1);
+      score[i] = (size_t)(-1);
+    }
 
   rewind(file);
   ibl = 0;
@@ -708,7 +711,8 @@ static size_t convert_file_to(FILE *file, const char *fromcode, int ncodes,
 
     /* Convert to UTF-8 */
     ib = bufi;
-    ob = bufu, obl = sizeof(bufu);
+    ob = bufu;
+    obl = sizeof(bufu);
     n = iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
     assert(n == (size_t)(-1) || !n);
     if (n == (size_t)(-1) && ((errno != EINVAL && errno != E2BIG) || ib == bufi))
@@ -723,8 +727,10 @@ static size_t convert_file_to(FILE *file, const char *fromcode, int ncodes,
     for (i = 0; i < ncodes; i++)
       if (cd[i] != (iconv_t)(-1) && score[i] != (size_t)(-1))
       {
-        ub = bufu, ubl = ubl1;
-        ob = bufo, obl = sizeof(bufo);
+        ub = bufu;
+        ubl = ubl1;
+        ob = bufo;
+        obl = sizeof(bufo);
         n = iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
         if (n == (size_t)(-1))
         {
@@ -822,7 +828,7 @@ static size_t convert_file_from_to(FILE *file, const char *fromcodes, const char
   {
     if ((c1 = strchr(c, ':')) == c)
       continue;
-    ++ncodes;
+    ncodes++;
   }
 
   /* Copy them */
@@ -1875,7 +1881,7 @@ static int write_one_header(FILE *fp, int pfxw, int max, int wraplen, const char
     {
       tagbuf = mutt_substrdup(start, t);
       /* skip over the colon separating the header field name and value */
-      ++t;
+      t++;
 
       /* skip over any leading whitespace (WSP, as defined in RFC5322)
        * NOTE: skip_email_wsp() does the wrong thing here.