Module Name: src
Committed By: rillig
Date: Mon Dec 5 23:41:24 UTC 2022
Modified Files:
src/usr.bin/make: str.h var.c
Log Message:
make: inline LazyBuf_AddBytesBetween
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/str.h
cvs rdiff -u -r1.1035 -r1.1036 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.15 src/usr.bin/make/str.h:1.16
--- src/usr.bin/make/str.h:1.15 Wed Dec 15 10:57:01 2021
+++ src/usr.bin/make/str.h Mon Dec 5 23:41:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: str.h,v 1.15 2021/12/15 10:57:01 rillig Exp $ */
+/* $NetBSD: str.h,v 1.16 2022/12/05 23:41:24 rillig Exp $ */
/*
Copyright (c) 2021 Roland Illig <ril...@netbsd.org>
@@ -273,21 +273,15 @@ LazyBuf_AddStr(LazyBuf *buf, const char
LazyBuf_Add(buf, *p);
}
-MAKE_STATIC void
-LazyBuf_AddBytesBetween(LazyBuf *buf, const char *start, const char *end)
+MAKE_INLINE void
+LazyBuf_AddSubstring(LazyBuf *buf, Substring sub)
{
const char *p;
- for (p = start; p != end; p++)
+ for (p = sub.start; p != sub.end; p++)
LazyBuf_Add(buf, *p);
}
-MAKE_INLINE void
-LazyBuf_AddSubstring(LazyBuf *buf, Substring sub)
-{
- LazyBuf_AddBytesBetween(buf, sub.start, sub.end);
-}
-
MAKE_STATIC Substring
LazyBuf_Get(const LazyBuf *buf)
{
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1035 src/usr.bin/make/var.c:1.1036
--- src/usr.bin/make/var.c:1.1035 Sat Oct 1 09:27:45 2022
+++ src/usr.bin/make/var.c Mon Dec 5 23:41:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1035 2022/10/01 09:27:45 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1036 2022/12/05 23:41:24 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.1035 2022/10/01 09:27:45 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1036 2022/12/05 23:41:24 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -2168,7 +2168,7 @@ ParseModifierPartDollar(const char **pp,
depth--;
}
}
- LazyBuf_AddBytesBetween(part, start, p);
+ LazyBuf_AddSubstring(part, Substring_Init(start, p));
*pp = p;
} else {
LazyBuf_Add(part, *start);
