Module Name: src
Committed By: rillig
Date: Fri Dec 29 12:20:55 UTC 2023
Modified Files:
src/usr.bin/make: cond.c make.c suff.c var.c
Log Message:
make: simplify memory allocation for string buffers
In edge cases and short-lived buffers, the initial buffer size is
irrelevant, so use the default.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/usr.bin/make/cond.c
cvs rdiff -u -r1.259 -r1.260 src/usr.bin/make/make.c
cvs rdiff -u -r1.372 -r1.373 src/usr.bin/make/suff.c
cvs rdiff -u -r1.1086 -r1.1087 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/cond.c
diff -u src/usr.bin/make/cond.c:1.357 src/usr.bin/make/cond.c:1.358
--- src/usr.bin/make/cond.c:1.357 Tue Dec 19 19:33:39 2023
+++ src/usr.bin/make/cond.c Fri Dec 29 12:20:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.357 2023/12/19 19:33:39 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.358 2023/12/29 12:20:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.357 2023/12/19 19:33:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.358 2023/12/29 12:20:55 rillig Exp $");
/*
* Conditional expressions conform to this grammar:
@@ -213,7 +213,7 @@ ParseWord(const char **pp, bool doEval)
Buffer word;
int depth;
- Buf_InitSize(&word, 16);
+ Buf_Init(&word);
depth = 0;
for (;;) {
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.259 src/usr.bin/make/make.c:1.260
--- src/usr.bin/make/make.c:1.259 Tue Feb 14 21:38:31 2023
+++ src/usr.bin/make/make.c Fri Dec 29 12:20:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.259 2023/02/14 21:38:31 rillig Exp $ */
+/* $NetBSD: make.c,v 1.260 2023/12/29 12:20:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -104,7 +104,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.259 2023/02/14 21:38:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.260 2023/12/29 12:20:55 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked_seqno = 1;
@@ -132,7 +132,7 @@ GNodeType_ToString(GNodeType type, void
{
Buffer buf;
- Buf_InitSize(&buf, 32);
+ Buf_Init(&buf);
#define ADD(flag) Buf_AddFlag(&buf, (type & (flag)) != OP_NONE, #flag)
ADD(OP_DEPENDS);
ADD(OP_FORCE);
@@ -174,7 +174,7 @@ GNodeFlags_ToString(GNodeFlags flags, vo
{
Buffer buf;
- Buf_InitSize(&buf, 32);
+ Buf_Init(&buf);
Buf_AddFlag(&buf, flags.remake, "REMAKE");
Buf_AddFlag(&buf, flags.childMade, "CHILDMADE");
Buf_AddFlag(&buf, flags.force, "FORCE");
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.372 src/usr.bin/make/suff.c:1.373
--- src/usr.bin/make/suff.c:1.372 Tue Dec 19 19:33:39 2023
+++ src/usr.bin/make/suff.c Fri Dec 29 12:20:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.372 2023/12/19 19:33:39 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.373 2023/12/29 12:20:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -115,7 +115,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.372 2023/12/19 19:33:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.373 2023/12/29 12:20:55 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -2113,7 +2113,7 @@ Suffix_Print(const Suffix *suff)
{
Buffer buf;
- Buf_InitSize(&buf, 16);
+ Buf_Init(&buf);
Buf_AddFlag(&buf, suff->include, "SUFF_INCLUDE");
Buf_AddFlag(&buf, suff->library, "SUFF_LIBRARY");
Buf_AddFlag(&buf, suff->isNull, "SUFF_NULL");
@@ -2169,7 +2169,7 @@ Suff_NamesStr(void)
SuffixListNode *ln;
Suffix *suff;
- Buf_InitSize(&buf, 16);
+ Buf_Init(&buf);
for (ln = sufflist.first; ln != NULL; ln = ln->next) {
suff = ln->datum;
if (ln != sufflist.first)
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1086 src/usr.bin/make/var.c:1.1087
--- src/usr.bin/make/var.c:1.1086 Wed Dec 20 09:03:08 2023
+++ src/usr.bin/make/var.c Fri Dec 29 12:20:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1086 2023/12/20 09:03:08 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1087 2023/12/29 12:20:55 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.1086 2023/12/20 09:03:08 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1087 2023/12/29 12:20:55 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -3252,7 +3252,7 @@ ApplyModifier_Words(const char **pp, Mod
size_t ac = words.len;
SubstringWords_Free(words);
- Buf_InitSize(&buf, 4);
+ Buf_Init(&buf);
Buf_AddInt(&buf, (int)ac);
Expr_SetValueOwn(expr, Buf_DoneData(&buf));
}
