Module Name: src
Committed By: rillig
Date: Tue Sep 8 18:10:34 UTC 2020
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make(1): add CondLexer_SkipWhitespace
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/usr.bin/make/cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.115 src/usr.bin/make/cond.c:1.116
--- src/usr.bin/make/cond.c:1.115 Tue Sep 8 18:06:27 2020
+++ src/usr.bin/make/cond.c Tue Sep 8 18:10:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.115 2020/09/08 18:06:27 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.116 2020/09/08 18:10:34 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.115 2020/09/08 18:06:27 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.116 2020/09/08 18:10:34 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.115 2020/09/08 18:06:27 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.116 2020/09/08 18:10:34 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -173,6 +173,13 @@ CondLexer_PushBack(CondLexer *lex, Token
lex->curr = t;
}
+static void
+CondLexer_SkipWhitespace(CondLexer *lex)
+{
+ while (isspace((unsigned char)lex->condExpr[0]))
+ lex->condExpr++;
+}
+
/* Parse the argument of a built-in function.
*
* Arguments:
@@ -538,11 +545,7 @@ compare_expression(CondLexer *lex, Boole
if (!lhs)
goto done;
- /*
- * Skip whitespace to get to the operator
- */
- while (isspace((unsigned char)*lex->condExpr))
- lex->condExpr++;
+ CondLexer_SkipWhitespace(lex);
/*
* Make sure the operator is a valid one. If it isn't a
@@ -586,8 +589,7 @@ compare_expression(CondLexer *lex, Boole
goto done;
}
- while (isspace((unsigned char)*lex->condExpr))
- lex->condExpr++;
+ CondLexer_SkipWhitespace(lex);
if (*lex->condExpr == '\0') {
Parse_Error(PARSE_WARNING,
