 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.108 2020/09/03 16:14:58 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.109 2020/09/03 17:16:01 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.108 2020/09/03 16:14:58 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.109 2020/09/03 17:16:01 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.108 2020/09/03 16:14:58 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.109 2020/09/03 17:16:01 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * cond.c --
  *	Functions to handle conditionals in a makefile.
+ *
  * Interface:
  *	Cond_Eval 	Evaluate the conditional in the passed line.
+ *
  */
 @@ -709,26 +709,27 @@ get_mpt_arg(Boolean doEval, const char *
     /*
      * For consistency with the other functions we can't generate the
      * true/false here.
      */
     length = *val ? 2 : 1;
     free(val_freeIt);
     return length;
+}
 static Boolean
 CondDoEmpty(int arglen, const char *arg MAKE_ATTR_UNUSED)
+{
     /* Magic values ahead, see get_mpt_arg. */
     return arglen == 1;
+}
 static Token
 compare_function(Boolean doEval)
+{
     static const struct fn_def {
 	const char *fn_name;
 	size_t fn_name_len;
 	int (*fn_getarg)(Boolean, const char **, char **, const char *);
 	Boolean (*fn_proc)(int, const char *);
     } fn_defs[] = {
 	{ "defined",  7, CondGetArg,  CondDoDefined },
 @@ -1222,27 +1223,27 @@ Cond_Eval(const char *line)
 	    max_if_depth += MAXIF_BUMP;
 	    cond_state = bmake_realloc(cond_state,
 				       max_if_depth * sizeof(*cond_state));
+	}
 	state = cond_state[cond_depth];
 	cond_depth++;
 	if (state > ELSE_ACTIVE) {
 	    /* If we aren't parsing the data, treat as always false */
 	    cond_state[cond_depth] = SKIP_TO_ELSE;
 	    return COND_SKIP;
+	}
+    }
-    /* And evaluate the conditional expresssion */
+    /* And evaluate the conditional expression */
     if (Cond_EvalExpression(ifp, line, &value, 1, TRUE) == COND_INVALID) {
 	/* Syntax error in conditional, error message already output. */
 	/* Skip everything to matching .endif */
 	cond_state[cond_depth] = SKIP_TO_ELSE;
 	return COND_SKIP;
+    }
     if (!value) {
 	cond_state[cond_depth] = SEARCH_FOR_ELIF;
 	return COND_SKIP;
+    }
     cond_state[cond_depth] = IF_ACTIVE;
     return COND_PARSE;