Module Name: src
Committed By: rillig
Date: Fri Jun 11 14:52:03 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: inline strcmp when parsing conditions
GCC 10 does not do that even though it could easily.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 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.266 src/usr.bin/make/cond.c:1.267
--- src/usr.bin/make/cond.c:1.266 Fri Jun 11 14:42:52 2021
+++ src/usr.bin/make/cond.c Fri Jun 11 14:52:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.266 2021/06/11 14:42:52 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.267 2021/06/11 14:52:03 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.266 2021/06/11 14:42:52 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.267 2021/06/11 14:52:03 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -400,7 +400,8 @@ TryParseNumber(const char *str, double *
static bool
is_separator(char ch)
{
- return ch == '\0' || ch_isspace(ch) || strchr("!=><)", ch) != NULL;
+ return ch == '\0' || ch_isspace(ch) || ch == '!' || ch == '=' ||
+ ch == '>' || ch == '<' || ch == ')' /* but not '(' */;
}
/*
