Module Name: src
Committed By: rillig
Date: Sun Nov 1 21:28:42 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): reduce number of nested parentheses in ApplyModifier_Assign
To generate a diff of this commit:
cvs rdiff -u -r1.637 -r1.638 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.637 src/usr.bin/make/var.c:1.638
--- src/usr.bin/make/var.c:1.637 Sun Nov 1 18:48:13 2020
+++ src/usr.bin/make/var.c Sun Nov 1 21:28:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $ */
+/* $NetBSD: var.c,v 1.638 2020/11/01 21:28:42 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.638 2020/11/01 21:28:42 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2949,11 +2949,13 @@ ApplyModifier_Assign(const char **pp, Ap
const char *mod = *pp;
const char *op = mod + 1;
- if (!(op[0] == '=' ||
- (op[1] == '=' &&
- (op[0] == '!' || op[0] == '+' || op[0] == '?'))))
- return AMR_UNKNOWN; /* "::<unrecognised>" */
+ if (op[0] == '=')
+ goto ok;
+ if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=')
+ goto ok;
+ return AMR_UNKNOWN; /* "::<unrecognised>" */
+ok:
if (st->v->name[0] == '\0') {
*pp = mod + 1;
