Reducing the indentation by short-circuiting a loop.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5727 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index e25e1a4fb3c5d3ceacc503b26607ac16e22f5678..c7d01e1a206a0c5cb58142386cc7802335aec0fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        just once, in a single place.  And unnest two 'if's.
        * src/rcfile.c (parse_one_include, parse_includes): New names for
        these functions, to be more distinguishable.
+       * src/rcfile.c (parse_colors): Reduce the indentation.
 
 2016-03-11  Benno Schulenberg  <bensberg@justemail.net>
        * src/browser.c (do_browser): Fix compilation when configured with

diff --git a/src/rcfile.c b/src/rcfile.c
index c3eeccb15bdeae90511ba15029b5e6d784a67567..4e433865262fc72f2c1f0acb3ef92f14a77ebd1f 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -718,37 +718,37 @@ void parse_colors(char *ptr, bool icase)
        } else
            cancelled = TRUE;
 
-       if (expectend) {
-           if (ptr == NULL || strncasecmp(ptr, "end=", 4) != 0) {
-               rcfile_error(
-                       N_("\"start=\" requires a corresponding \"end=\""));
-               return;
-           }
-           ptr += 4;
-           if (*ptr != '"') {
-               rcfile_error(
-                       N_("Regex strings must begin and end with a \" character"));
-               continue;
-           }
+       if (!expectend)
+           continue;
 
-           fgstr = ++ptr;
-           ptr = parse_next_regex(ptr);
-           if (ptr == NULL)
-               break;
+       if (ptr == NULL || strncasecmp(ptr, "end=", 4) != 0) {
+           rcfile_error(N_("\"start=\" requires a corresponding \"end=\""));
+           return;
+       }
 
-           /* If the start regex was invalid, skip past the end regex
-            * to stay in sync. */
-           if (cancelled)
-               continue;
+       ptr += 4;
+       if (*ptr != '"') {
+           rcfile_error(N_("Regex strings must begin and end with a \" character"));
+           continue;
+       }
 
-           /* If it's valid, save the ending regex string. */
-           if (nregcomp(fgstr, icase ? REG_ICASE : 0))
-               newcolor->end_regex = mallocstrcpy(NULL, fgstr);
+       fgstr = ++ptr;
+       ptr = parse_next_regex(ptr);
+       if (ptr == NULL)
+            break;
 
-           /* Lame way to skip another static counter. */
-           newcolor->id = live_syntax->nmultis;
-           live_syntax->nmultis++;
-       }
+       /* If the start regex was invalid, skip past the end regex
+        * to stay in sync. */
+       if (cancelled)
+           continue;
+
+       /* If it's valid, save the ending regex string. */
+       if (nregcomp(fgstr, icase ? REG_ICASE : 0))
+           newcolor->end_regex = mallocstrcpy(NULL, fgstr);
+
+       /* Lame way to skip another static counter. */
+       newcolor->id = live_syntax->nmultis;
+       live_syntax->nmultis++;
     }
 }