Module Name: src
Committed By: rillig
Date: Sat Jan 8 17:25:19 UTC 2022
Modified Files:
src/usr.bin/make: buf.c buf.h for.c var.c
Log Message:
make: inline Buf_Clear
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/make/buf.c
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/make/buf.h
cvs rdiff -u -r1.158 -r1.159 src/usr.bin/make/for.c
cvs rdiff -u -r1.997 -r1.998 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/buf.c
diff -u src/usr.bin/make/buf.c:1.54 src/usr.bin/make/buf.c:1.55
--- src/usr.bin/make/buf.c:1.54 Wed Dec 15 09:29:55 2021
+++ src/usr.bin/make/buf.c Sat Jan 8 17:25:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.54 2021/12/15 09:29:55 rillig Exp $ */
+/* $NetBSD: buf.c,v 1.55 2022/01/08 17:25:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,7 +75,7 @@
#include "make.h"
/* "@(#)buf.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: buf.c,v 1.54 2021/12/15 09:29:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: buf.c,v 1.55 2022/01/08 17:25:19 rillig Exp $");
/* Make space in the buffer for adding at least 16 more bytes. */
void
@@ -138,14 +138,6 @@ Buf_AddFlag(Buffer *buf, bool flag, cons
}
}
-/* Mark the buffer as empty, so it can be filled with data again. */
-void
-Buf_Empty(Buffer *buf)
-{
- buf->len = 0;
- buf->data[0] = '\0';
-}
-
/* Initialize a buffer. */
void
Buf_InitSize(Buffer *buf, size_t cap)
Index: src/usr.bin/make/buf.h
diff -u src/usr.bin/make/buf.h:1.46 src/usr.bin/make/buf.h:1.47
--- src/usr.bin/make/buf.h:1.46 Wed Dec 15 12:08:25 2021
+++ src/usr.bin/make/buf.h Sat Jan 8 17:25:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.46 2021/12/15 12:08:25 rillig Exp $ */
+/* $NetBSD: buf.h,v 1.47 2022/01/08 17:25:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -88,6 +88,14 @@ typedef struct Buffer {
void Buf_Expand(Buffer *);
+/* Mark the buffer as empty, so it can be filled with data again. */
+MAKE_INLINE void
+Buf_Clear(Buffer *buf)
+{
+ buf->len = 0;
+ buf->data[0] = '\0';
+}
+
/* Buf_AddByte adds a single byte to a buffer. */
MAKE_INLINE void
Buf_AddByte(Buffer *buf, char byte)
@@ -112,7 +120,6 @@ void Buf_AddBytesBetween(Buffer *, const
void Buf_AddStr(Buffer *, const char *);
void Buf_AddInt(Buffer *, int);
void Buf_AddFlag(Buffer *, bool, const char *);
-void Buf_Empty(Buffer *);
void Buf_Init(Buffer *);
void Buf_InitSize(Buffer *, size_t);
void Buf_Done(Buffer *);
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.158 src/usr.bin/make/for.c:1.159
--- src/usr.bin/make/for.c:1.158 Fri Jan 7 23:13:50 2022
+++ src/usr.bin/make/for.c Sat Jan 8 17:25:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.158 2022/01/07 23:13:50 rillig Exp $ */
+/* $NetBSD: for.c,v 1.159 2022/01/08 17:25:19 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.158 2022/01/07 23:13:50 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.159 2022/01/08 17:25:19 rillig Exp $");
typedef struct ForLoop {
@@ -429,7 +429,7 @@ ForLoop_SubstBody(ForLoop *f, Buffer *bo
const char *p, *end;
const char *mark; /* where the last substitution left off */
- Buf_Empty(body);
+ Buf_Clear(body);
mark = f->body.data;
end = f->body.data + f->body.len;
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.997 src/usr.bin/make/var.c:1.998
--- src/usr.bin/make/var.c:1.997 Sat Jan 8 11:04:13 2022
+++ src/usr.bin/make/var.c Sat Jan 8 17:25:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.997 2022/01/08 11:04:13 rillig Exp $ */
+/* $NetBSD: var.c,v 1.998 2022/01/08 17:25:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.997 2022/01/08 11:04:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.998 2022/01/08 17:25:19 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -999,7 +999,7 @@ Var_SetWithFlags(GNode *scope, const cha
scope->name, name, val);
return;
}
- Buf_Empty(&v->val);
+ Buf_Clear(&v->val);
Buf_AddStr(&v->val, val);
DEBUG3(VAR, "%s: %s = %s\n", scope->name, name, val);
