Modernize the coding style.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 637c4332b358644fddca9d12fc9700777c85ba4b..60e711536eb3590fc990a7297c57f2ffb56841d4 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-07  Bruno Haible  <bruno@clisp.org>
 
+       * lib/fstrcmp.c: Modernize the coding style.
+
        * lib/fstrcmp.c: Include <stdbool.h>. Use bool where appropriate.
        Rename 'minimal' to 'find_minimal'.
 

diff --git a/gnulib-local/lib/fstrcmp.c b/gnulib-local/lib/fstrcmp.c
index c8be805ebe61fc5fa6bcf31d1c7df8f337d8faa2..efd87017c39cdbad8ac79eb4fa4645517c9484f8 100644 (file)
--- a/gnulib-local/lib/fstrcmp.c
+++ b/gnulib-local/lib/fstrcmp.c
@@ -226,8 +226,8 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
          OFFSET tlo;
          OFFSET thi;
 
-         tlo = fd[d - 1],
-           thi = fd[d + 1];
+         tlo = fd[d - 1];
+         thi = fd[d + 1];
 
          if (tlo >= thi)
            x = tlo + 1;
@@ -268,8 +268,9 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
          OFFSET tlo;
          OFFSET thi;
 
-         tlo = bd[d - 1],
-           thi = bd[d + 1];
+         tlo = bd[d - 1];
+         thi = bd[d + 1];
+
          if (tlo < thi)
            x = tlo;
          else
@@ -323,17 +324,9 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
 
              if (v > 12 * (c + (dd < 0 ? -dd : dd)))
                {
-                 if
-                   (
-                     v > best
-                     &&
-                     xoff + SNAKE_LIMIT <= x
-                     &&
-                     x < xlim
-                     &&
-                     yoff + SNAKE_LIMIT <= y
-                     &&
-                     y < ylim
+                 if (v > best
+                     && xoff + SNAKE_LIMIT <= x && x < xlim
+                     && yoff + SNAKE_LIMIT <= y && y < ylim
                    )
                    {
                      /* We have a good enough best diagonal; now insist