cosmetic: binary operator goes *after* the newline, when split

* src/dfa.c (match_mb_charset): Join split lines.
(parse_bracket_exp): Move "||" from end of first split line
to the beginning of the continued line.
* src/dosbuf.c (dossified_pos): Likewise, but for "&&".

2 files changed, 5 insertions, 6 deletions

diff --git a/src/dfa.c b/src/dfa.c
index a78e7605..96d462f2 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1121,8 +1121,8 @@ parse_bracket_exp (void)
               regcomp (&re, pattern, REG_NOSUB);
               for (c = 0; c < NOTCHAR; ++c)
                 {
-                  if ((case_fold && isupper (c)) ||
-                      (MB_CUR_MAX > 1 && btowc (c) == WEOF))
+                  if ((case_fold && isupper (c))
+                      || (MB_CUR_MAX > 1 && btowc (c) == WEOF))
                     continue;
                   subject[0] = c;
                   if (regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
@@ -3036,8 +3036,7 @@ match_mb_charset (struct dfa *d, state_num s, position pos, size_t idx)
   /* match with a range?  */
   for (i = 0; i < work_mbc->nranges; i++)
     {
-      if (work_mbc->range_sts[i] <= wc &&
-          wc <= work_mbc->range_ends[i])
+      if (work_mbc->range_sts[i] <= wc && wc <= work_mbc->range_ends[i])
         goto charset_matched;
     }
 
diff --git a/src/dosbuf.c b/src/dosbuf.c
index 07f1280c..bcbef162 100644
--- a/src/dosbuf.c
+++ b/src/dosbuf.c
@@ -184,8 +184,8 @@ dossified_pos (off_t byteno)
   if (byteno >= pos_hi)
     {
       out_map_idx++;
-      while (out_map_idx < dos_pos_map_used &&
-             byteno >= dos_pos_map[out_map_idx].pos)
+      while (out_map_idx < dos_pos_map_used
+             && byteno >= dos_pos_map[out_map_idx].pos)
         out_map_idx++;
     }