Module Name: src
Committed By: rillig
Date: Sun Oct 25 20:09:28 UTC 2020
Modified Files:
src/usr.bin/make: job.c
Log Message:
make(1): inline error message
This saves a variable, and since bmake needs to adhere to C90, this
variable declaration prevents refactoring the code.
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/usr.bin/make/job.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/job.c
diff -u src/usr.bin/make/job.c:1.278 src/usr.bin/make/job.c:1.279
--- src/usr.bin/make/job.c:1.278 Sun Oct 25 19:57:43 2020
+++ src/usr.bin/make/job.c Sun Oct 25 20:09:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.278 2020/10/25 19:57:43 rillig Exp $ */
+/* $NetBSD: job.c,v 1.279 2020/10/25 20:09:28 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.278 2020/10/25 19:57:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.279 2020/10/25 20:09:28 rillig Exp $");
# define STATIC static
@@ -1208,7 +1208,6 @@ Job_CheckCommands(GNode *gn, void (*abor
* given, we stop in our tracks, otherwise we just don't update
* this node's parents so they never get examined.
*/
- static const char msg[] = ": don't know how to make";
if (gn->flags & FROM_DEPEND) {
if (!Job_RunTarget(".STALE", gn->fname))
@@ -1219,16 +1218,17 @@ Job_CheckCommands(GNode *gn, void (*abor
}
if (gn->type & OP_OPTIONAL) {
- (void)fprintf(stdout, "%s%s %s (ignored)\n", progname,
- msg, gn->name);
+ (void)fprintf(stdout, "%s: don't know how to make %s (%s)\n",
+ progname, gn->name, "ignored");
(void)fflush(stdout);
} else if (keepgoing) {
- (void)fprintf(stdout, "%s%s %s (continuing)\n", progname,
- msg, gn->name);
+ (void)fprintf(stdout, "%s: don't know how to make %s (%s)\n",
+ progname, gn->name, "continuing");
(void)fflush(stdout);
return FALSE;
} else {
- (*abortProc)("%s%s %s. Stop", progname, msg, gn->name);
+ abortProc("%s: don't know how to make %s. Stop",
+ progname, gn->name);
return FALSE;
}
}
