 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.105 2021/01/03 17:11:19 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.106 2021/01/03 17:42:45 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
 @@ -28,27 +28,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: decl.c,v 1.105 2021/01/03 17:11:19 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.106 2021/01/03 17:42:45 rillig Exp $");
 #endif
 #include <sys/param.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 const	char *unnamed = "<unnamed>";
 /* shared type structures for arithmtic types and void */
 static	type_t	*typetab;
 @@ -307,27 +307,27 @@ add_type(type_t *tp)
 			/* invalid type for _Complex */
 			error(308);
 			t = DCOMPLEX; /* just as a fallback */
+		}
 		dcs->d_cmod = NOTSPEC;
+	}
 	if (t == LONG && dcs->d_lmod == LONG) {
 		/* "long long" or "long ... long" */
 		t = QUAD;
 		dcs->d_lmod = NOTSPEC;
 		if (!quadflg)
 			/* %s C does not support 'long long' */
-			(void)c99ism(265, tflag ? "traditional" : "c89");
+			c99ism(265, tflag ? "traditional" : "c89");
+	}
 	if (dcs->d_type != NULL && dcs->d_type->t_typedef) {
 		/* something like "typedef int a; a long ..." */
 		dcs->d_type = tdeferr(dcs->d_type, t);
 		return;
+	}
 	/* now it can be only a combination of arithmetic types and void */
 	if (t == SIGNED || t == UNSIGN) {
 		/* remember specifiers "signed" & "unsigned" in dcs->d_smod */
 		if (dcs->d_smod != NOTSPEC)
 			/*
 @@ -1768,28 +1768,28 @@ complete_tag_struct_or_union(type_t *tp,
 	setcomplete(tp, 1);
 	t = tp->t_tspec;
 	align(dcs->d_stralign, 0);
 	sp = tp->t_str;
 	sp->align = dcs->d_stralign;
 	sp->memb = fmem;
 	if (tp->t_ispacked)
 		setpackedsize(tp);
 	else
 		sp->size = dcs->d_offset;
 	if (sp->size == 0) {
-		/* zero sized %s */
+		/* zero sized %s is a C9X feature */
-		(void)c99ism(47, ttab[t].tt_name);
+		c99ism(47, ttab[t].tt_name);
+	}
 	n = 0;
 	for (mem = fmem; mem != NULL; mem = mem->s_next) {
 		/* bind anonymous members to the structure */
 		if (mem->s_styp == NULL) {
 			mem->s_styp = sp;
 			if (mem->s_type->t_isfield) {
 				sp->size += bitfieldsize(&mem);
 				if (mem == NULL)
 					break;
+			}
 			sp->size += tsize(mem->s_type);
 @@ -2521,27 +2521,28 @@ check_prototype_declaration(sym_t *arg,
+{
 	type_t	*tp, *ptp;
 	int	dowarn, msg;
 	tp = arg->s_type;
 	ptp = parg->s_type;
 	msg = 0;
 	dowarn = 0;
 	if (!eqtype(tp, ptp, 1, 1, &dowarn)) {
 		if (eqtype(tp, ptp, 1, 0, &dowarn)) {
 			/* type does not match prototype: %s */
-			msg = gnuism(58, arg->s_name);
+			gnuism(58, arg->s_name);
 			msg = sflag || !gflag;
 		} else {
 			/* type does not match prototype: %s */
 			error(58, arg->s_name);
 			msg = 1;
+		}
 	} else if (dowarn) {
 		if (sflag)
 			/* type does not match prototype: %s */
 			error(58, arg->s_name);
 		else
 			/* type does not match prototype: %s */
 			warning(58, arg->s_name);
 		msg = 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.62 2021/01/03 16:59:59 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.63 2021/01/03 17:42:45 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.62 2021/01/03 16:59:59 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.63 2021/01/03 17:42:45 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;
 @@ -524,54 +524,41 @@ message(int n, ...)
 	fn = lbasename(curr_pos.p_file);
 	(void)printf("%s(%d): ", fn, curr_pos.p_line);
 	(void)vprintf(msgs[n], ap);
 	(void)printf(" [%d]\n", n);
 	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]
 */
-int
+void
 c99ism(int n, ...)
+{
 	va_list	ap;
-	int	msg;
+	bool extensions_ok = Sflag || gflag;
 	va_start(ap, n);
-	if (sflag && !(Sflag || gflag)) {
+	if (sflag && !extensions_ok) {
 		verror(n, ap);
-		msg = 1;
+	} else if (sflag || !extensions_ok) {
 	} else if (!sflag && (Sflag || gflag)) {
 		msg = 0;
 	} else {
 		vwarning(n, ap);
 		msg = 1;
+	}
 	va_end(ap);
 	return msg;
+}
-int
+void
 gnuism(int n, ...)
+{
 	va_list	ap;
 	int	msg;
 	va_start(ap, n);
 	if (sflag && !gflag) {
 		verror(n, ap);
-		msg = 1;
+	} else if (sflag || !gflag) {
 	} else if (!sflag && gflag) {
 		msg = 0;
 	} else {
 		vwarning(n, ap);
 		msg = 1;
+	}
 	va_end(ap);
 	return msg;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: externs1.h,v 1.44 2021/01/02 18:44:58 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.45 2021/01/03 17:42:45 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.
 @@ -113,28 +113,28 @@ extern	struct	mbl *tsave(void);
 extern	void	trestor(struct mbl *);
 /*
  * err.c
  */
 extern	int	nerr;
 extern	int	sytxerr;
 extern	const	char *msgs[];
 extern	void	msglist(void);
 extern	void	error(int, ...);
 extern	void	warning(int, ...);
 extern	void	message(int, ...);
-extern	int	gnuism(int, ...);
+extern	void	gnuism(int, ...);
-extern	int	c99ism(int, ...);
+extern	void	c99ism(int, ...);
 extern	void	lerror(const char *, int, const char *, ...)
      __attribute__((__noreturn__,__format__(__printf__, 3, 4)));
 extern	void	assert_failed(const char *, int, const char *, const char *)
 		__attribute__((__noreturn__));
 /*
  * decl.c
  */
 extern	dinfo_t	*dcs;
 extern	const	char *unnamed;
 extern	int	enumval;
 extern	void	initdecl(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.57 2021/01/02 03:49:25 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.58 2021/01/03 17:42:45 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: init.c,v 1.57 2021/01/02 03:49:25 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.58 2021/01/03 17:42:45 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Type of stack which is used for initialisation of aggregate types.
+ *
  * XXX: Since C99, a stack is an inappropriate data structure for modelling
  * an initialization, since the designators don't have to be listed in a
 @@ -642,27 +642,27 @@ mkinit(tnode_t *tn)
 			/* bit-field initialisation is illegal in trad. C */
 			warning(186);
+	}
 	if (lt != rt || (initstk->i_type->t_isfield && tn->tn_op == CON))
 		tn = convert(INIT, 0, initstk->i_type, tn);
 	if (tn != NULL && tn->tn_op != CON) {
 		sym = NULL;
 		offs = 0;
 		if (conaddr(tn, &sym, &offs) == -1) {
 			if (sc == AUTO || sc == REG) {
 				/* non-constant initializer */
-				(void)c99ism(177);
+				c99ism(177);
 			} else {
 				/* non-constant initializer */
 				error(177);
+			}
+		}
+	}
+}
 static int
 initstack_string(tnode_t *tn)
+{
 	tspec_t	t;

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: scan.l,v 1.110 2021/01/02 01:06:15 rillig Exp $ */
+/* $NetBSD: scan.l,v 1.111 2021/01/03 17:42:45 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
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * 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.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.110 2021/01/02 01:06:15 rillig Exp $");
+__RCSID("$NetBSD: scan.l,v 1.111 2021/01/03 17:42:45 rillig Exp $");
 #endif
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 @@ -1306,28 +1306,28 @@ comment(void)
 			eoc = 1;
+	}
+}
 /*
  * Handle // style comments
  */
 static void
 slashslashcomment(void)
+{
 	int c;
 	if (!Sflag && !gflag)
-		/* // comments only supported in C99 */
+		/* %s C does not support // comments */
-		(void)gnuism(312, tflag ? "traditional" : "ANSI");
+		gnuism(312, tflag ? "traditional" : "ANSI");
 	while ((c = inpc()) != EOF && c != '\n')
 		continue;
+}
 /*
  * Clear flags for lint comments LINTED, LONGLONG and CONSTCOND.
  * clrwflgs() is called after function definitions and global and
  * local declarations and definitions. It is also called between
  * the controlling expression and the body of control statements
  * (if, switch, for, while).
  */
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.117 2021/01/03 15:51:16 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.118 2021/01/03 17:42:45 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: tree.c,v 1.117 2021/01/03 15:51:16 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.118 2021/01/03 17:42:45 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 #include "externs1.h"
 @@ -650,29 +650,29 @@ build(op_t op, tnode_t *ln, tnode_t *rn)
  * Lvalues are converted to rvalues.
  */
 tnode_t *
 cconv(tnode_t *tn)
+{
 	type_t	*tp;
 	/*
 	 * Array-lvalue (array of type T) is converted into rvalue
 	 * (pointer to type T)
 	 */
 	if (tn->tn_type->t_tspec == ARRAY) {
 		if (!tn->tn_lvalue) {
 			/* %soperand of '%s' must be lvalue */
 			/* XXX print correct operator */
-			(void)gnuism(114, "", modtab[AMPER].m_name);
+			/* %soperand of '%s' must be lvalue */
 			gnuism(114, "", modtab[AMPER].m_name);
+		}
 		tn = new_tnode(AMPER, tincref(tn->tn_type->t_subt, PTR),
 			     tn, NULL);
+	}
 	/*
 	 * Expression of type function (function with return value of type T)
 	 * in rvalue-expression (pointer to function with return value
 	 * of type T)
 	 */
 	if (tn->tn_type->t_tspec == FUNC)
 		tn = build_ampersand(tn, 1);
 @@ -2621,27 +2621,27 @@ plength(type_t *tp)
 	while (tp->t_tspec == ARRAY) {
 		elem *= tp->t_dim;
 		tp = tp->t_subt;
+	}
 	switch (tp->t_tspec) {
 	case FUNC:
 		/* pointer to function is not allowed here */
 		error(110);
 		break;
 	case VOID:
 		/* cannot do pointer arithmetic on operand of ... */
-		(void)gnuism(136);
+		gnuism(136);
 		break;
 	case STRUCT:
 	case UNION:
 		if ((elsz = tp->t_str->size) == 0)
 			/* cannot do pointer arithmetic on operand of ... */
 			error(136);
 		break;
 	case ENUM:
 		if (incompl(tp)) {
 			/* cannot do pointer arithmetic on operand of ... */
 			warning(136);
+		}
 		/* FALLTHROUGH */