Module Name: src
Committed By: rillig
Date: Sat Nov 27 22:04:02 UTC 2021
Modified Files:
src/usr.bin/make: make.h meta.c
Log Message:
make: remove CONSTCOND comments, lint no longer needs them
To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.266 src/usr.bin/make/make.h
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/make/meta.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.h
diff -u src/usr.bin/make/make.h:1.265 src/usr.bin/make/make.h:1.266
--- src/usr.bin/make/make.h:1.265 Sun Sep 12 09:51:14 2021
+++ src/usr.bin/make/make.h Sat Nov 27 22:04:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.265 2021/09/12 09:51:14 rillig Exp $ */
+/* $NetBSD: make.h,v 1.266 2021/11/27 22:04:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -581,7 +581,7 @@ void debug_printf(const char *, ...) MAK
do { \
if (DEBUG(module)) \
debug_printf args; \
- } while (/*CONSTCOND*/false)
+ } while (false)
#define DEBUG0(module, text) \
DEBUG_IMPL(module, ("%s", text))
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.184 src/usr.bin/make/meta.c:1.185
--- src/usr.bin/make/meta.c:1.184 Sun Oct 24 18:45:46 2021
+++ src/usr.bin/make/meta.c Sat Nov 27 22:04:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.184 2021/10/24 18:45:46 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.185 2021/11/27 22:04:02 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -409,7 +409,7 @@ printCMDs(GNode *gn, FILE *fp)
} \
return false; \
} \
-} while (/*CONSTCOND*/false)
+} while (false)
/*
@@ -1711,7 +1711,7 @@ meta_compat_parent(pid_t child)
fflush(stdout);
buf[nread] = '\0';
meta_job_output(NULL, buf, "");
- } while (/*CONSTCOND*/false);
+ } while (false);
if (metafd != -1 && FD_ISSET(metafd, &readfds) != 0) {
if (meta_job_event(NULL) <= 0)
metafd = -1;