Module Name: src Committed By: rillig Date: Sun Nov 8 19:24:19 UTC 2020
Modified Files: src/usr.bin/make: cond.c var.c Log Message: make(1): clean up VarEvalFlags in the calls to Var_Parse and Var_Subst There are only 3 flags, and some combinations don't even make sense. VARE_UNDEFERR only makes sense if combined with VARE_WANTRES. If the latter is not set, the variable expressions are only parsed, without asking whether they are defined or not. Therefore, VARE_UNDEFERR cannot have any effect in that case. VARE_KEEP_DOLLAR is actively ignored by ParseModifierPart. In cases where VARE_WANTRES is not set, this means that VARE_NONE can be passed, which is easier to grasp than any bitset operations. This also gets rid of a few type casts from enum to unsigned int that were necessary to pass WARNS=6. To generate a diff of this commit: cvs rdiff -u -r1.185 -r1.186 src/usr.bin/make/cond.c cvs rdiff -u -r1.680 -r1.681 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.