Module Name: src
Committed By: rillig
Date: Fri Jan 5 21:51:27 UTC 2024
Modified Files:
src/usr.bin/make: str.h var.c
Log Message:
make: inline Substring_Sub
Remove redundant assertions.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/str.h
cvs rdiff -u -r1.1090 -r1.1091 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/str.h
diff -u src/usr.bin/make/str.h:1.17 src/usr.bin/make/str.h:1.18
--- src/usr.bin/make/str.h:1.17 Fri Jun 23 04:56:54 2023
+++ src/usr.bin/make/str.h Fri Jan 5 21:51:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: str.h,v 1.17 2023/06/23 04:56:54 rillig Exp $ */
+/* $NetBSD: str.h,v 1.18 2024/01/05 21:51:27 rillig Exp $ */
/*
Copyright (c) 2021 Roland Illig <ril...@netbsd.org>
@@ -154,14 +154,6 @@ Substring_Eq(Substring sub, Substring st
memcmp(sub.start, str.start, len) == 0;
}
-MAKE_STATIC Substring
-Substring_Sub(Substring sub, size_t start, size_t end)
-{
- assert(start <= Substring_Length(sub));
- assert(end <= Substring_Length(sub));
- return Substring_Init(sub.start + start, sub.start + end);
-}
-
MAKE_STATIC bool
Substring_HasPrefix(Substring sub, Substring prefix)
{
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1090 src/usr.bin/make/var.c:1.1091
--- src/usr.bin/make/var.c:1.1090 Fri Dec 29 14:57:00 2023
+++ src/usr.bin/make/var.c Fri Jan 5 21:51:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1090 2023/12/29 14:57:00 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1091 2024/01/05 21:51:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1090 2023/12/29 14:57:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1091 2024/01/05 21:51:27 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -4222,7 +4222,8 @@ FindLocalLegacyVar(Substring varname, GN
if (strchr("@%?*!<>", varname.start[0]) == NULL)
return NULL;
- v = VarFindSubstring(Substring_Sub(varname, 0, 1), scope, false);
+ v = VarFindSubstring(Substring_Init(varname.start, varname.start + 1),
+ scope, false);
if (v == NULL)
return NULL;
