Module Name: src
Committed By: rillig
Date: Sat Oct 3 12:51:49 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): extract ApplyModifier_Literal into separate function
To generate a diff of this commit:
cvs rdiff -u -r1.561 -r1.562 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.561 src/usr.bin/make/var.c:1.562
--- src/usr.bin/make/var.c:1.561 Sat Oct 3 12:46:52 2020
+++ src/usr.bin/make/var.c Sat Oct 3 12:51:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.561 2020/10/03 12:46:52 rillig Exp $ */
+/* $NetBSD: var.c,v 1.562 2020/10/03 12:51:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.561 2020/10/03 12:46:52 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.562 2020/10/03 12:51:49 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2065,6 +2065,16 @@ ApplyModifier_Defined(const char **pp, A
return AMR_OK;
}
+/* :L */
+static ApplyModifierResult
+ApplyModifier_Literal(const char **pp, ApplyModifiersState *st)
+{
+ ApplyModifiersState_Define(st);
+ st->newVal = bmake_strdup(st->v->name);
+ (*pp)++;
+ return AMR_OK;
+}
+
/* :gmtime */
static ApplyModifierResult
ApplyModifier_Gmtime(const char **pp, ApplyModifiersState *st)
@@ -3076,10 +3086,7 @@ ApplyModifier(const char **pp, ApplyModi
case 'U':
return ApplyModifier_Defined(pp, st);
case 'L':
- ApplyModifiersState_Define(st);
- st->newVal = bmake_strdup(st->v->name);
- (*pp)++;
- return AMR_OK;
+ return ApplyModifier_Literal(pp, st);
case 'P':
return ApplyModifier_Path(pp, st);
case '!':
