Module Name: src
Committed By: rillig
Date: Sat Jul 29 10:45:00 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: Makefile err.c main1.c
Log Message:
lint1: remove option -m
The list of lint messages is only needed for generating the manual page
lint.7. Since 2022-07-06, that list is extracted from the source code
instead of compiling and then running lint1.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.213 -r1.214 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.76 -r1.77 src/usr.bin/xlint/lint1/main1.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/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.101 src/usr.bin/xlint/lint1/Makefile:1.102
--- src/usr.bin/xlint/lint1/Makefile:1.101 Sat Jul 29 10:34:24 2023
+++ src/usr.bin/xlint/lint1/Makefile Sat Jul 29 10:45:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2023/07/29 10:34:24 rillig Exp $
+# $NetBSD: Makefile,v 1.102 2023/07/29 10:45:00 rillig Exp $
.include <bsd.own.mk>
@@ -35,11 +35,6 @@ BINDIR= /usr/libexec
CLEANFILES+= ${MAN} ${MAN}.date
-.if ${USETOOLS} == "yes"
-LINT1= ${TOOLDIR}/libexec/${MACHINE_GNU_PLATFORM}-lint1
-.endif
-LINT1?= ./${PROG}
-
${MAN}.date: err.c
${_MKTARGET_CREATE}
${TOOL_SED} -E \
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.213 src/usr.bin/xlint/lint1/err.c:1.214
--- src/usr.bin/xlint/lint1/err.c:1.213 Fri Jul 21 06:02:07 2023
+++ src/usr.bin/xlint/lint1/err.c Sat Jul 29 10:45:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.213 2023/07/21 06:02:07 rillig Exp $ */
+/* $NetBSD: err.c,v 1.214 2023/07/29 10:45:00 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.213 2023/07/21 06:02:07 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.214 2023/07/29 10:45:00 rillig Exp $");
#endif
#include <limits.h>
@@ -484,22 +484,6 @@ print_stack_trace(void)
}
/*
- * print a list of the messages with their ids
- */
-void
-msglist(void)
-{
- size_t i;
-
- for (i = 0; i < sizeof(msgs) / sizeof(msgs[0]); i++) {
- if (msgs[i][0] != '\0')
- printf("%zu\t%s\n", i, msgs[i]);
- else
- printf("---\t(no longer used)\n");
- }
-}
-
-/*
* If Fflag is not set, lbasename() returns a pointer to the last
* component of the path, otherwise it returns the argument.
*/
Index: src/usr.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.76 src/usr.bin/xlint/lint1/main1.c:1.77
--- src/usr.bin/xlint/lint1/main1.c:1.76 Sat Jul 29 07:49:14 2023
+++ src/usr.bin/xlint/lint1/main1.c Sat Jul 29 10:45:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main1.c,v 1.76 2023/07/29 07:49:14 rillig Exp $ */
+/* $NetBSD: main1.c,v 1.77 2023/07/29 10:45:00 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: main1.c,v 1.76 2023/07/29 07:49:14 rillig Exp $");
+__RCSID("$NetBSD: main1.c,v 1.77 2023/07/29 10:45:00 rillig Exp $");
#endif
#include <sys/types.h>
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
setprogname(argv[0]);
- while ((c = getopt(argc, argv, "abceghmpq:rstuvwyzA:FPR:STX:")) != -1) {
+ while ((c = getopt(argc, argv, "abceghpq:rstuvwyzA:FPR:STX:")) != -1) {
switch (c) {
case 'a': aflag++; break;
case 'b': bflag = true; break;
@@ -194,10 +194,6 @@ main(int argc, char *argv[])
usage();
break;
- case 'm':
- msglist();
- return 0;
-
case 'R':
add_directory_replacement(optarg);
break;
