Module Name: src
Committed By: rillig
Date: Sun May 12 18:00:59 UTC 2024
Modified Files:
src/usr.bin/xlint/lint1: externs1.h main1.c
src/usr.bin/xlint/xlint: xlint.c
Log Message:
lint: remove unused flag '-u' from lint1
This flag is completely handled by lint2.
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/xlint/lint1/main1.c
cvs rdiff -u -r1.123 -r1.124 src/usr.bin/xlint/xlint/xlint.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/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.228 src/usr.bin/xlint/lint1/externs1.h:1.229
--- src/usr.bin/xlint/lint1/externs1.h:1.228 Sun May 12 12:28:34 2024
+++ src/usr.bin/xlint/lint1/externs1.h Sun May 12 18:00:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.228 2024/05/12 12:28:34 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.229 2024/05/12 18:00:58 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -46,7 +46,6 @@ extern bool eflag;
extern bool hflag;
extern bool pflag;
extern bool rflag;
-extern bool uflag;
extern bool vflag;
extern bool wflag;
extern bool yflag;
Index: src/usr.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.82 src/usr.bin/xlint/lint1/main1.c:1.83
--- src/usr.bin/xlint/lint1/main1.c:1.82 Sat Feb 3 19:37:02 2024
+++ src/usr.bin/xlint/lint1/main1.c Sun May 12 18:00:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main1.c,v 1.82 2024/02/03 19:37:02 rillig Exp $ */
+/* $NetBSD: main1.c,v 1.83 2024/05/12 18:00:58 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.82 2024/02/03 19:37:02 rillig Exp $");
+__RCSID("$NetBSD: main1.c,v 1.83 2024/05/12 18:00:58 rillig Exp $");
#endif
#include <sys/types.h>
@@ -60,7 +60,6 @@ bool Pflag;
bool pflag;
bool rflag;
bool Tflag;
-bool uflag;
bool vflag;
bool wflag;
bool yflag;
@@ -138,7 +137,7 @@ main(int argc, char *argv[])
setlocale(LC_ALL, "");
setprogname(argv[0]);
- while ((c = getopt(argc, argv, "abceghpq:rstuvwyzA:FPR:STX:")) != -1) {
+ while ((c = getopt(argc, argv, "abceghpq:rstvwyzA:FPR:STX:")) != -1) {
switch (c) {
case 'a': aflag++; break;
case 'b': bflag = true; break;
@@ -173,7 +172,6 @@ main(int argc, char *argv[])
allow_c11 = false;
allow_c23 = false;
break;
- case 'u': uflag = true; break;
case 'w': wflag = true; break;
case 'v': vflag = true; break;
case 'y': yflag = true; break;
@@ -262,7 +260,7 @@ static void __dead
usage(void)
{
(void)fprintf(stderr,
- "usage: %s [-abceghmprstuvwyzFPST] [-Alevel] [-ddirectory] "
+ "usage: %s [-abceghmprstvwyzFPST] [-Alevel] [-d directory] "
"[-R old=new]\n"
" %*s [-X id,...] [-q id,...] src dest\n",
getprogname(), (int)strlen(getprogname()), "");
Index: src/usr.bin/xlint/xlint/xlint.c
diff -u src/usr.bin/xlint/xlint/xlint.c:1.123 src/usr.bin/xlint/xlint/xlint.c:1.124
--- src/usr.bin/xlint/xlint/xlint.c:1.123 Sat Mar 2 09:32:19 2024
+++ src/usr.bin/xlint/xlint/xlint.c Sun May 12 18:00:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.123 2024/03/02 09:32:19 rillig Exp $ */
+/* $NetBSD: xlint.c,v 1.124 2024/05/12 18:00:59 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: xlint.c,v 1.123 2024/03/02 09:32:19 rillig Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.124 2024/05/12 18:00:59 rillig Exp $");
#endif
#include <sys/param.h>
@@ -617,7 +617,6 @@ main(int argc, char *argv[])
case 'F':
Fflag = true;
/* FALLTHROUGH */
- case 'u':
case 'h':
list_add_flag(&lint1.flags, c);
list_add_flag(&lint2.flags, c);
@@ -684,6 +683,7 @@ main(int argc, char *argv[])
break;
#endif
+ case 'u':
case 'x':
case 'H':
list_add_flag(&lint2.flags, c);
