Module Name: src
Committed By: rillig
Date: Wed Jun 15 18:06:51 UTC 2022
Modified Files:
src/usr.bin/xlint/lint1: decl.c err.c externs1.h
Log Message:
lint: unexport lint's messages
There was only a single place where a message was used directly, instead
of calling one of the several functions for this purpose.
To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.169 -r1.170 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.160 -r1.161 src/usr.bin/xlint/lint1/externs1.h
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.286 src/usr.bin/xlint/lint1/decl.c:1.287
--- src/usr.bin/xlint/lint1/decl.c:1.286 Wed Jun 15 17:57:16 2022
+++ src/usr.bin/xlint/lint1/decl.c Wed Jun 15 18:06:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.286 2022/06/15 17:57:16 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.287 2022/06/15 18:06:51 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.286 2022/06/15 17:57:16 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.287 2022/06/15 18:06:51 rillig Exp $");
#endif
#include <sys/param.h>
@@ -850,8 +850,8 @@ length_in_bits(const type_t *tp, const c
switch (tp->t_tspec) {
case FUNC:
- /* compiler takes size of function */
- INTERNAL_ERROR("%s", msgs[12]);
+ lint_assert(/*CONSTCOND*/ false);
+ break; /* GCC 10 thinks this were reachable */
/* NOTREACHED */
case STRUCT:
case UNION:
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.169 src/usr.bin/xlint/lint1/err.c:1.170
--- src/usr.bin/xlint/lint1/err.c:1.169 Sat Jun 11 12:23:59 2022
+++ src/usr.bin/xlint/lint1/err.c Wed Jun 15 18:06:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.169 2022/06/11 12:23:59 rillig Exp $ */
+/* $NetBSD: err.c,v 1.170 2022/06/15 18:06:51 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.169 2022/06/11 12:23:59 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.170 2022/06/15 18:06:51 rillig Exp $");
#endif
#include <sys/types.h>
@@ -53,7 +53,7 @@ int nerr;
int sytxerr;
-const char *const msgs[] = {
+static const char *const msgs[] = {
"empty declaration", /* 0 */
"old style declaration; add 'int'", /* 1 */
"empty declaration", /* 2 */
Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.160 src/usr.bin/xlint/lint1/externs1.h:1.161
--- src/usr.bin/xlint/lint1/externs1.h:1.160 Sat Apr 30 22:31:23 2022
+++ src/usr.bin/xlint/lint1/externs1.h Wed Jun 15 18:06:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.160 2022/04/30 22:31:23 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.161 2022/06/15 18:06:51 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -153,7 +153,6 @@ void debug_leave(const char *);
*/
extern int nerr;
extern int sytxerr;
-extern const char *const msgs[];
extern void msglist(void);
extern void error_at(int, const pos_t *, ...);
