Module Name: src
Committed By: rillig
Date: Mon Jul 3 10:23:12 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: decl.c func.c main1.c
src/usr.bin/xlint/lint2: chk.c main2.c
Log Message:
lint: invert the -u, -v and -z flags
Now they behave the same as in the manual page.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.164 -r1.165 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.69 -r1.70 src/usr.bin/xlint/lint1/main1.c
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/xlint/lint2/main2.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/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.340 src/usr.bin/xlint/lint1/decl.c:1.341
--- src/usr.bin/xlint/lint1/decl.c:1.340 Mon Jul 3 07:03:19 2023
+++ src/usr.bin/xlint/lint1/decl.c Mon Jul 3 10:23:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.340 2023/07/03 07:03:19 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.341 2023/07/03 10:23:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.340 2023/07/03 07:03:19 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.341 2023/07/03 10:23:12 rillig Exp $");
#endif
#include <sys/param.h>
@@ -2918,7 +2918,7 @@ check_argument_usage(bool novar, sym_t *
if (novar)
return;
- if (!arg->s_used && vflag) {
+ if (!arg->s_used && !vflag) {
/* argument '%s' unused in function '%s' */
warning_at(231, &arg->s_def_pos, arg->s_name, funcsym->s_name);
}
@@ -3018,7 +3018,7 @@ check_tag_usage(sym_t *sym)
return;
/* always complain about incomplete tags declared inside blocks */
- if (!zflag || dcs->d_kind != DLK_EXTERN)
+ if (zflag || dcs->d_kind != DLK_EXTERN)
return;
switch (sym->s_type->t_tspec) {
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.164 src/usr.bin/xlint/lint1/func.c:1.165
--- src/usr.bin/xlint/lint1/func.c:1.164 Mon Jul 3 07:03:19 2023
+++ src/usr.bin/xlint/lint1/func.c Mon Jul 3 10:23:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.164 2023/07/03 07:03:19 rillig Exp $ */
+/* $NetBSD: func.c,v 1.165 2023/07/03 10:23:12 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: func.c,v 1.164 2023/07/03 07:03:19 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.165 2023/07/03 10:23:12 rillig Exp $");
#endif
#include <stdlib.h>
@@ -1283,7 +1283,7 @@ lintlib(int n)
return;
}
llibflg = true;
- vflag = false;
+ vflag = true;
}
/* Suppress one or most warnings at the current and the following line. */
Index: src/usr.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.69 src/usr.bin/xlint/lint1/main1.c:1.70
--- src/usr.bin/xlint/lint1/main1.c:1.69 Mon Jul 3 10:14:31 2023
+++ src/usr.bin/xlint/lint1/main1.c Mon Jul 3 10:23:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main1.c,v 1.69 2023/07/03 10:14:31 rillig Exp $ */
+/* $NetBSD: main1.c,v 1.70 2023/07/03 10:23:12 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.69 2023/07/03 10:14:31 rillig Exp $");
+__RCSID("$NetBSD: main1.c,v 1.70 2023/07/03 10:23:12 rillig Exp $");
#endif
#include <sys/types.h>
@@ -59,11 +59,11 @@ bool Pflag;
bool pflag;
bool rflag;
bool Tflag;
-bool uflag = true;
-bool vflag = true;
+bool uflag;
+bool vflag;
bool wflag;
bool yflag;
-bool zflag = true;
+bool zflag;
/*
* The default language level is the one that checks for compatibility
@@ -171,11 +171,11 @@ main(int argc, char *argv[])
allow_c11 = false;
allow_c23 = false;
break;
- case 'u': uflag = false; break;
+ case 'u': uflag = true; break;
case 'w': wflag = true; break;
- case 'v': vflag = false; break;
+ case 'v': vflag = true; break;
case 'y': yflag = true; break;
- case 'z': zflag = false; break;
+ case 'z': zflag = true; break;
case 'A':
if (strcmp(optarg, "c23") == 0) {
Index: src/usr.bin/xlint/lint2/chk.c
diff -u src/usr.bin/xlint/lint2/chk.c:1.56 src/usr.bin/xlint/lint2/chk.c:1.57
--- src/usr.bin/xlint/lint2/chk.c:1.56 Mon Jul 3 07:03:19 2023
+++ src/usr.bin/xlint/lint2/chk.c Mon Jul 3 10:23:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: chk.c,v 1.56 2023/07/03 07:03:19 rillig Exp $ */
+/* $NetBSD: chk.c,v 1.57 2023/07/03 10:23:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: chk.c,v 1.56 2023/07/03 07:03:19 rillig Exp $");
+__RCSID("$NetBSD: chk.c,v 1.57 2023/07/03 10:23:12 rillig Exp $");
#endif
#include <ctype.h>
@@ -90,7 +90,7 @@ check_name(const hte_t *hte)
{
sym_t *sym, *def, *pdecl, *decl;
- if (uflag) {
+ if (!uflag) {
check_used_not_defined(hte);
check_defined_not_used(hte);
if (xflag)
Index: src/usr.bin/xlint/lint2/main2.c
diff -u src/usr.bin/xlint/lint2/main2.c:1.29 src/usr.bin/xlint/lint2/main2.c:1.30
--- src/usr.bin/xlint/lint2/main2.c:1.29 Fri Jun 9 13:03:49 2023
+++ src/usr.bin/xlint/lint2/main2.c Mon Jul 3 10:23:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main2.c,v 1.29 2023/06/09 13:03:49 rillig Exp $ */
+/* $NetBSD: main2.c,v 1.30 2023/07/03 10:23:12 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: main2.c,v 1.29 2023/06/09 13:03:49 rillig Exp $");
+__RCSID("$NetBSD: main2.c,v 1.30 2023/07/03 10:23:12 rillig Exp $");
#endif
#include <stdio.h>
@@ -50,11 +50,7 @@ __RCSID("$NetBSD: main2.c,v 1.29 2023/06
/* warnings for symbols which are declared but not defined or used */
bool xflag;
-/*
- * warnings for symbols which are used and not defined or defined
- * and not used
- */
-bool uflag = true;
+bool uflag;
/* Create a lint library in the current directory with name libname. */
bool Cflag;
@@ -113,7 +109,7 @@ main(int argc, char *argv[])
tflag = true;
break;
case 'u':
- uflag = false;
+ uflag = true;
break;
case 'x':
xflag = true;
@@ -124,7 +120,7 @@ main(int argc, char *argv[])
(void)sprintf(lname, "llib-l%s.ln", optarg);
libname = lname;
Cflag = true;
- uflag = false;
+ uflag = true;
break;
case 'H':
Hflag = true;
