Nitpick run.

[lilypond.git] / flower / parse-afm.cc

diff --git a/flower/parse-afm.cc b/flower/parse-afm.cc
index 60f553b588e338eeeef7159a29bbaef9fb29df1e..d5147f1d7465640f6cbdfa97511f64c43ce0a711 100644 (file)
--- a/flower/parse-afm.cc
+++ b/flower/parse-afm.cc
@@ -203,13 +203,13 @@ token (FILE *stream)
   int ch, idx;
 
   /* skip over white space */
-  while ((ch = fgetc (stream)) == ' ' || ch == lineterm ||
-        ch == lineterm_alt ||
-        ch == ',' || ch == '\t' || ch == ';');
+  while ((ch = fgetc (stream)) == ' ' || ch == lineterm
+        || ch == lineterm_alt
+        || ch == ',' || ch == '\t' || ch == ';');
 
   idx = 0;
-  while (idx < MAX_NAME - 1 &&
-        ch != EOF && ch != ' ' && ch != lineterm && ch != lineterm_alt
+  while (idx < MAX_NAME - 1
+        && ch != EOF && ch != ' ' && ch != lineterm && ch != lineterm_alt
         && ch != '\t' && ch != ':' && ch != ';')
     {
       ident[idx++] = ch;
@@ -217,8 +217,8 @@ token (FILE *stream)
     } /* while */
 
   if (ch == EOF && idx < 1) return ((char *)NULL);
-  if (idx >= 1 && ch != ':' ) ungetc (ch, stream);
-  if (idx < 1 ) ident[idx++] = ch;     /* single-character token */
+  if (idx >= 1 && ch != ':') ungetc (ch, stream);
+  if (idx < 1) ident[idx++] = ch;      /* single-character token */
   ident[idx] = 0;
 
   return (ident);      /* returns pointer to the token */
@@ -236,11 +236,11 @@ linetoken (FILE *stream)
 {
   int ch, idx;
 
-  while ((ch = fgetc (stream)) == ' ' || ch == '\t' );
+  while ((ch = fgetc (stream)) == ' ' || ch == '\t');
 
   idx = 0;
-  while (idx < MAX_NAME - 1 &&
-        ch != EOF && ch != lineterm && ch != lineterm_alt)
+  while (idx < MAX_NAME - 1
+        && ch != EOF && ch != lineterm && ch != lineterm_alt)
     {
       ident[idx++] = ch;
       ch = fgetc (stream);