Module Name: src
Committed By: rillig
Date: Tue Sep 22 20:23:57 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): condense code in Var_Subst
To generate a diff of this commit:
cvs rdiff -u -r1.533 -r1.534 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.533 src/usr.bin/make/var.c:1.534
--- src/usr.bin/make/var.c:1.533 Tue Sep 22 20:19:46 2020
+++ src/usr.bin/make/var.c Tue Sep 22 20:23:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.533 2020/09/22 20:19:46 rillig Exp $ */
+/* $NetBSD: var.c,v 1.534 2020/09/22 20:23:57 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.533 2020/09/22 20:19:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.534 2020/09/22 20:23:57 rillig Exp $");
#define VAR_DEBUG_IF(cond, fmt, ...) \
if (!(DEBUG(VAR) && (cond))) \
@@ -3793,12 +3793,8 @@ Var_Subst(const char *str, GNode *ctxt,
str++;
}
} else {
- size_t val_len;
-
str = nested_str;
-
- val_len = strlen(val);
- Buf_AddBytes(&buf, val, val_len);
+ Buf_AddStr(&buf, val);
}
free(freeIt);
freeIt = NULL;
