Module Name: src
Committed By: rillig
Date: Sat Jan 14 09:30:07 UTC 2023
Modified Files:
src/usr.bin/xlint/common: emit.c
src/usr.bin/xlint/lint2: emit2.c read.c
Log Message:
lint: clean up messages for internal errors
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/xlint/common/emit.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/xlint/lint2/emit2.c
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/xlint/lint2/read.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/common/emit.c
diff -u src/usr.bin/xlint/common/emit.c:1.17 src/usr.bin/xlint/common/emit.c:1.18
--- src/usr.bin/xlint/common/emit.c:1.17 Fri May 20 21:18:54 2022
+++ src/usr.bin/xlint/common/emit.c Sat Jan 14 09:30:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: emit.c,v 1.17 2022/05/20 21:18:54 rillig Exp $ */
+/* $NetBSD: emit.c,v 1.18 2023/01/14 09:30:07 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: emit.c,v 1.17 2022/05/20 21:18:54 rillig Exp $");
+__RCSID("$NetBSD: emit.c,v 1.18 2023/01/14 09:30:07 rillig Exp $");
#endif
#include <stdio.h>
@@ -112,7 +112,7 @@ outclr(void)
outchar('\n');
sz = ob.o_next - ob.o_buf;
if (sz > ob.o_len)
- errx(1, "internal error: outclr() 1");
+ errx(1, "internal error: outclr");
if (fwrite(ob.o_buf, sz, 1, lout) != 1)
err(1, "cannot write to %s", loname);
ob.o_next = ob.o_buf;
Index: src/usr.bin/xlint/lint2/emit2.c
diff -u src/usr.bin/xlint/lint2/emit2.c:1.28 src/usr.bin/xlint/lint2/emit2.c:1.29
--- src/usr.bin/xlint/lint2/emit2.c:1.28 Fri May 20 21:18:55 2022
+++ src/usr.bin/xlint/lint2/emit2.c Sat Jan 14 09:30:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: emit2.c,v 1.28 2022/05/20 21:18:55 rillig Exp $ */
+/* $NetBSD: emit2.c,v 1.29 2023/01/14 09:30:07 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: emit2.c,v 1.28 2022/05/20 21:18:55 rillig Exp $");
+__RCSID("$NetBSD: emit2.c,v 1.29 2023/01/14 09:30:07 rillig Exp $");
#endif
#include "lint2.h"
@@ -94,7 +94,7 @@ outtype(type_t *tp)
outchar('.');
outint(tp->t_uniqpos.p_uniq);
} else
- errx(1, "internal error: outtype() 2");
+ errx(1, "internal error: outtype");
} else if (ts == FUNC && tp->t_args != NULL) {
na = 0;
for (ap = tp->t_args; *ap != NULL; ap++)
@@ -189,7 +189,7 @@ dumpname(hte_t *hte)
def = sym;
}
if (def == NULL)
- errx(1, "internal error: dumpname() %s", hte->h_name);
+ errx(1, "internal error: dumpname %s", hte->h_name);
outdef(hte, def);
}
Index: src/usr.bin/xlint/lint2/read.c
diff -u src/usr.bin/xlint/lint2/read.c:1.77 src/usr.bin/xlint/lint2/read.c:1.78
--- src/usr.bin/xlint/lint2/read.c:1.77 Fri Jan 13 19:50:00 2023
+++ src/usr.bin/xlint/lint2/read.c Sat Jan 14 09:30:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.77 2023/01/13 19:50:00 rillig Exp $ */
+/* $NetBSD: read.c,v 1.78 2023/01/14 09:30:07 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: read.c,v 1.77 2023/01/13 19:50:00 rillig Exp $");
+__RCSID("$NetBSD: read.c,v 1.78 2023/01/14 09:30:07 rillig Exp $");
#endif
#include <ctype.h>
@@ -305,7 +305,7 @@ setfnid(int fid, const char *cp)
* file by lint1 are always the previous index + 1.
*/
if ((size_t)fid >= ninpfns)
- errx(1, "internal error: setfnid()");
+ errx(1, "internal error: setfnid");
inpfns[fid] = (unsigned short)getfnidx(cp);
}
