From: Bruno Haible <bruno@clisp.org>
Date: Mon, 18 Dec 2006 12:36:54 +0000 (+0000)
Subject: Modernize the coding style.
X-Git-Tag: v0.17~571
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13185500616815a52b9ce4531f762d89b2f7e79d;p=thirdparty%2Fgettext.git

Modernize the coding style.
---

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 637c4332b..60e711536 100644
--- 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 c8be805eb..efd87017c 100644
--- 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