Module Name: src
Committed By: rillig
Date: Mon Dec 5 23:28:08 UTC 2022
Modified Files:
src/usr.bin/make: make.c
Log Message:
make: inline local macro in GNodeFlags_ToString
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/usr.bin/make/make.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/make.c
diff -u src/usr.bin/make/make.c:1.257 src/usr.bin/make/make.c:1.258
--- src/usr.bin/make/make.c:1.257 Tue Sep 27 17:46:58 2022
+++ src/usr.bin/make/make.c Mon Dec 5 23:28:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.257 2022/09/27 17:46:58 rillig Exp $ */
+/* $NetBSD: make.c,v 1.258 2022/12/05 23:28:08 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.257 2022/09/27 17:46:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.258 2022/12/05 23:28:08 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked_seqno = 1;
@@ -175,17 +175,15 @@ GNodeFlags_ToString(GNodeFlags flags, vo
Buffer buf;
Buf_InitSize(&buf, 32);
-#define ADD(flag, name) Buf_AddFlag(&buf, flags.flag, name)
- ADD(remake, "REMAKE");
- ADD(childMade, "CHILDMADE");
- ADD(force, "FORCE");
- ADD(doneWait, "DONE_WAIT");
- ADD(doneOrder, "DONE_ORDER");
- ADD(fromDepend, "FROM_DEPEND");
- ADD(doneAllsrc, "DONE_ALLSRC");
- ADD(cycle, "CYCLE");
- ADD(doneCycle, "DONECYCLE");
-#undef ADD
+ Buf_AddFlag(&buf, flags.remake, "REMAKE");
+ Buf_AddFlag(&buf, flags.childMade, "CHILDMADE");
+ Buf_AddFlag(&buf, flags.force, "FORCE");
+ Buf_AddFlag(&buf, flags.doneWait, "DONE_WAIT");
+ Buf_AddFlag(&buf, flags.doneOrder, "DONE_ORDER");
+ Buf_AddFlag(&buf, flags.fromDepend, "FROM_DEPEND");
+ Buf_AddFlag(&buf, flags.doneAllsrc, "DONE_ALLSRC");
+ Buf_AddFlag(&buf, flags.cycle, "CYCLE");
+ Buf_AddFlag(&buf, flags.doneCycle, "DONECYCLE");
return buf.len == 0 ? "none" : (*freeIt = Buf_DoneData(&buf));
}
