 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.114 2021/04/18 10:02:16 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.115 2021/04/18 10:09:49 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.114 2021/04/18 10:02:16 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.115 2021/04/18 10:09:49 rillig Exp $");
 #endif
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include "lint1.h"
 /* number of errors found */
 int	nerr;
 /* number of syntax errors */
 int	sytxerr;
 @@ -474,97 +474,97 @@ lbasename(const char *path)
 		return path;
 	p = base = dir = path;
 	while (*p != '\0') {
 		if (*p++ == '/') {
 			dir = base;
 			base = p;
+		}
+	}
 	return *base != '\0' ? base : dir;
+}
 static void
-verror_at(int n, pos_t pos, va_list ap)
+verror_at(int msgid, pos_t pos, va_list ap)
+{
 	const	char *fn;
-	if (ERR_ISSET(n, &msgset))
+	if (ERR_ISSET(msgid, &msgset))
 		return;
 	fn = lbasename(pos.p_file);
 	(void)printf("%s(%d): error: ", fn, pos.p_line);
-	(void)vprintf(msgs[n], ap);
+	(void)vprintf(msgs[msgid], ap);
-	(void)printf(" [%d]\n", n);
+	(void)printf(" [%d]\n", msgid);
 	nerr++;
 	print_stack_trace();
+}
 static void
-vwarning_at(int n, pos_t pos, va_list ap)
+vwarning_at(int msgid, pos_t pos, va_list ap)
+{
 	const	char *fn;
-	if (ERR_ISSET(n, &msgset))
+	if (ERR_ISSET(msgid, &msgset))
 		return;
 #ifdef DEBUG
-	printf("%s: lwarn=%d n=%d\n", __func__, lwarn, n);
+	printf("%s: lwarn=%d msgid=%d\n", __func__, lwarn, msgid);
 #endif
-	if (lwarn == LWARN_NONE || lwarn == n)
+	if (lwarn == LWARN_NONE || lwarn == msgid)
 		/* this warning is suppressed by a LINTED comment */
 		return;
 	fn = lbasename(pos.p_file);
 	(void)printf("%s(%d): warning: ", fn, pos.p_line);
-	(void)vprintf(msgs[n], ap);
+	(void)vprintf(msgs[msgid], ap);
-	(void)printf(" [%d]\n", n);
+	(void)printf(" [%d]\n", msgid);
 	if (wflag)
 		nerr++;
 	print_stack_trace();
+}
 static void
-vmessage_at(int n, pos_t pos, va_list ap)
+vmessage_at(int msgid, pos_t pos, va_list ap)
+{
 	const char *fn;
-	if (ERR_ISSET(n, &msgset))
+	if (ERR_ISSET(msgid, &msgset))
 		return;
 	fn = lbasename(pos.p_file);
 	(void)printf("%s(%d): ", fn, pos.p_line);
-	(void)vprintf(msgs[n], ap);
+	(void)vprintf(msgs[msgid], ap);
-	(void)printf(" [%d]\n", n);
+	(void)printf(" [%d]\n", msgid);
 	print_stack_trace();
+}
 void
-(error_at)(int n, pos_t pos, ...)
+(error_at)(int msgid, pos_t pos, ...)
+{
 	va_list	ap;
 	va_start(ap, pos);
-	verror_at(n, pos, ap);
+	verror_at(msgid, pos, ap);
 	va_end(ap);
+}
 void
-(error)(int n, ...)
+(error)(int msgid, ...)
+{
 	va_list	ap;
-	va_start(ap, n);
+	va_start(ap, msgid);
-	verror_at(n, curr_pos, ap);
+	verror_at(msgid, curr_pos, ap);
 	va_end(ap);
+}
 void
 internal_error(const char *file, int line, const char *msg, ...)
+{
 	va_list	ap;
 	const	char *fn;
 	fn = lbasename(curr_pos.p_file);
 	(void)fprintf(stderr, "lint: internal error in %s:%d near %s:%d: ",
 	    file, line, fn, curr_pos.p_line);
 	va_start(ap, msg);
 @@ -579,98 +579,98 @@ void
 assert_failed(const char *file, int line, const char *func, const char *cond)
+{
 	const	char *fn;
 	fn = lbasename(curr_pos.p_file);
 	(void)fprintf(stderr,
 	    "lint: assertion \"%s\" failed in %s at %s:%d near %s:%d\n",
 	    cond, func, file, line, fn, curr_pos.p_line);
 	print_stack_trace();
 	abort();
+}
 void
-(warning_at)(int n, pos_t pos, ...)
+(warning_at)(int msgid, pos_t pos, ...)
+{
 	va_list	ap;
 	va_start(ap, pos);
-	vwarning_at(n, pos, ap);
+	vwarning_at(msgid, pos, ap);
 	va_end(ap);
+}
 void
-(warning)(int n, ...)
+(warning)(int msgid, ...)
+{
 	va_list	ap;
-	va_start(ap, n);
+	va_start(ap, msgid);
-	vwarning_at(n, curr_pos, ap);
+	vwarning_at(msgid, curr_pos, ap);
 	va_end(ap);
+}
 void
-(message_at)(int n, pos_t pos, ...)
+(message_at)(int msgid, pos_t pos, ...)
+{
 	va_list ap;
 	va_start(ap, pos);
-	vmessage_at(n, pos, ap);
+	vmessage_at(msgid, pos, ap);
 	va_end(ap);
+}
 void
-(message)(int n, ...)
+(message)(int msgid, ...)
+{
 	va_list	ap;
-	va_start(ap, n);
+	va_start(ap, msgid);
-	vmessage_at(n, curr_pos, ap);
+	vmessage_at(msgid, curr_pos, ap);
 	va_end(ap);
+}
 /*
  * XXX I think the logic is possibly somewhat screwed up here. The
  * question is, how do we want to interpret the -s and -S flags going
  * forward? We need to answer that and then we can fix this to be
  * "right"... [perry, 2 Nov 2002]
 */
 void
-(c99ism)(int n, ...)
+(c99ism)(int msgid, ...)
+{
 	va_list	ap;
 	bool extensions_ok = Sflag || gflag;
-	va_start(ap, n);
+	va_start(ap, msgid);
 	if (sflag && !extensions_ok) {
-		verror_at(n, curr_pos, ap);
+		verror_at(msgid, curr_pos, ap);
 	} else if (sflag || !extensions_ok) {
-		vwarning_at(n, curr_pos, ap);
+		vwarning_at(msgid, curr_pos, ap);
+	}
 	va_end(ap);
+}
 void
-(c11ism)(int n, ...)
+(c11ism)(int msgid, ...)
+{
 	va_list	ap;
 	if (c11flag || gflag)
 		return;
-	va_start(ap, n);
+	va_start(ap, msgid);
-	verror_at(n, curr_pos, ap);
+	verror_at(msgid, curr_pos, ap);
 	va_end(ap);
+}
 void
-(gnuism)(int n, ...)
+(gnuism)(int msgid, ...)
+{
 	va_list	ap;
-	va_start(ap, n);
+	va_start(ap, msgid);
 	if (sflag && !gflag) {
-		verror_at(n, curr_pos, ap);
+		verror_at(msgid, curr_pos, ap);
 	} else if (sflag || !gflag) {
-		vwarning_at(n, curr_pos, ap);
+		vwarning_at(msgid, curr_pos, ap);
+	}
 	va_end(ap);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.98 2021/04/18 10:04:23 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.99 2021/04/18 10:09:49 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -466,51 +466,51 @@ typedef	struct err_set {
 extern err_set	msgset;
 #ifdef DEBUG
 #  include "err-msgs.h"
 /* ARGSUSED */
 static inline void __attribute__((format(printf, 1, 2)))
 check_printf(const char *fmt, ...)
+{
+}
-#  define wrap_check_printf_at(func, id, pos, args...)			\
+#  define wrap_check_printf_at(func, msgid, pos, args...)		\
 	do {								\
-		check_printf(__CONCAT(MSG_, id), ##args);		\
+		check_printf(__CONCAT(MSG_, msgid), ##args);		\
-		(func)(id, pos, ##args);				\
+		(func)(msgid, pos, ##args);				\
 	} while (/*CONSTCOND*/false)
-#  define error_at(id, pos, args...) \
+#  define error_at(msgid, pos, args...) \
-	wrap_check_printf_at(error_at, id, pos, ##args)
+	wrap_check_printf_at(error_at, msgid, pos, ##args)
-#  define warning_at(id, pos, args...) \
+#  define warning_at(msgid, pos, args...) \
-	wrap_check_printf_at(warning_at, id, pos, ##args)
+	wrap_check_printf_at(warning_at, msgid, pos, ##args)
-#  define message_at(id, pos, args...) \
+#  define message_at(msgid, pos, args...) \
-	wrap_check_printf_at(message_at, id, pos, ##args)
+	wrap_check_printf_at(message_at, msgid, pos, ##args)
-#  define wrap_check_printf(func, id, args...)				\
+#  define wrap_check_printf(func, msgid, args...)			\
 	do {								\
-		check_printf(__CONCAT(MSG_, id), ##args);		\
+		check_printf(__CONCAT(MSG_, msgid), ##args);		\
-		(func)(id, ##args);					\
+		(func)(msgid, ##args);					\
 	} while (/*CONSTCOND*/false)
-#  define error(id, args...) wrap_check_printf(error, id, ##args)
+#  define error(msgid, args...) wrap_check_printf(error, msgid, ##args)
-#  define warning(id, args...) wrap_check_printf(warning, id, ##args)
+#  define warning(msgid, args...) wrap_check_printf(warning, msgid, ##args)
-#  define message(id, args...) wrap_check_printf(message, id, ##args)
+#  define message(msgid, args...) wrap_check_printf(message, msgid, ##args)
-#  define gnuism(id, args...) wrap_check_printf(gnuism, id, ##args)
+#  define gnuism(msgid, args...) wrap_check_printf(gnuism, msgid, ##args)
-#  define c99ism(id, args...) wrap_check_printf(c99ism, id, ##args)
+#  define c99ism(msgid, args...) wrap_check_printf(c99ism, msgid, ##args)
-#  define c11ism(id, args...) wrap_check_printf(c11ism, id, ##args)
+#  define c11ism(msgid, args...) wrap_check_printf(c11ism, msgid, ##args)
 #endif
 static inline bool
 is_nonzero_val(const val_t *val)
+{
 	return is_floating(val->v_tspec)
 	    ? val->v_ldbl != 0.0
 	    : val->v_quad != 0;
+}
 static inline bool
 constant_is_nonzero(const tnode_t *tn)
+{