Module Name: src Committed By: rillig Date: Fri Jan 7 12:44:57 UTC 2022
Modified Files: src/usr.bin/make: var.c Log Message: make: merge calls to ApplyModifier_Time This enables GCC 11 to inline ApplyModifier_Time, like all the other modifiers. Similar pattern as for ':M' and ':N', as well as for ':D' and ':U'. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.994 -r1.995 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.994 src/usr.bin/make/var.c:1.995 --- src/usr.bin/make/var.c:1.994 Fri Jan 7 12:37:27 2022 +++ src/usr.bin/make/var.c Fri Jan 7 12:44:57 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.994 2022/01/07 12:37:27 rillig Exp $ */ +/* $NetBSD: var.c,v 1.995 2022/01/07 12:44:57 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -140,7 +140,7 @@ #include "metachar.h" /* "@(#)var.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: var.c,v 1.994 2022/01/07 12:37:27 rillig Exp $"); +MAKE_RCSID("$NetBSD: var.c,v 1.995 2022/01/07 12:44:57 rillig Exp $"); /* * Variables are defined using one of the VAR=value assignments. Their @@ -2596,13 +2596,14 @@ TryParseTime(const char **pp, time_t *ou /* :gmtime and :localtime */ static ApplyModifierResult -ApplyModifier_Time(const char **pp, ModChain *ch, bool gmt) +ApplyModifier_Time(const char **pp, ModChain *ch) { Expr *expr; time_t t; const char *args; - const char *mod = *pp; + bool gmt = mod[0] == 'g'; + if (!ModMatchEq(mod, gmt ? "gmtime" : "localtime", ch)) return AMR_UNKNOWN; args = mod + (gmt ? 6 : 9); @@ -3832,15 +3833,14 @@ ApplyModifier(const char **pp, ModChain case 'E': return ApplyModifier_WordFunc(pp, ch, ModifyWord_Suffix); case 'g': - return ApplyModifier_Time(pp, ch, true); + case 'l': + return ApplyModifier_Time(pp, ch); case 'H': return ApplyModifier_WordFunc(pp, ch, ModifyWord_Head); case 'h': return ApplyModifier_Hash(pp, ch); case 'L': return ApplyModifier_Literal(pp, ch); - case 'l': - return ApplyModifier_Time(pp, ch, false); case 'M': case 'N': return ApplyModifier_Match(pp, ch);