[src/trunk]: src/usr.bin/make make(1): reduce indentation in ParseDependencyS...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c41adc9c295f
branches:  trunk
changeset: 957622:c41adc9c295f
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Dec 05 19:06:51 2020 +0000

description:
make(1): reduce indentation in ParseDependencySourceKeyword

diffstat:

 usr.bin/make/parse.c |  32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diffs (57 lines):

diff -r 6c8a9e4972a4 -r c41adc9c295f usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Dec 05 19:03:45 2020 +0000
+++ b/usr.bin/make/parse.c      Sat Dec 05 19:06:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.467 2020/12/05 19:03:45 rillig Exp $       */
+/*     $NetBSD: parse.c,v 1.468 2020/12/05 19:06:51 rillig Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*     "@(#)parse.c    8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.467 2020/12/05 19:03:45 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.468 2020/12/05 19:06:51 rillig Exp $");
 
 /* types and constants */
 
@@ -882,22 +882,26 @@
 static Boolean
 ParseDependencySourceKeyword(const char *src, ParseSpecial specType)
 {
-
-    if (*src == '.' && ch_isupper(src[1])) {
-       int keywd = ParseFindKeyword(src);
-       if (keywd != -1) {
-           GNodeType op = parseKeywords[keywd].op;
-           if (op != 0) {
+       int keywd;
+       GNodeType op;
+
+       if (*src != '.' || !ch_isupper(src[1]))
+               return FALSE;
+
+       keywd = ParseFindKeyword(src);
+       if (keywd == -1)
+               return FALSE;
+
+       op = parseKeywords[keywd].op;
+       if (op != OP_NONE) {
                ApplyDependencyOperator(op);
                return TRUE;
-           }
-           if (parseKeywords[keywd].spec == SP_WAIT) {
-               ParseDependencySourceWait(specType != SP_NOT);
+       }
+       if (parseKeywords[keywd].spec == SP_WAIT) {
+               ParseDependencySourceWait(specType != SP_NOT);
                return TRUE;
-           }
        }
-    }
-    return FALSE;
+       return FALSE;
 }
 
 static void