 @@ -1,14 +1,14 @@
-/*	$NetBSD: lint.h,v 1.19 2021/01/01 11:51:15 rillig Exp $	*/
+/*	$NetBSD: lint.h,v 1.20 2021/01/01 11:58:03 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.
 @@ -83,41 +83,41 @@ typedef enum {
 	DCOMPLEX,	/* double _Complex */
 	LCOMPLEX	/* long double _Complex */
 #define NTSPEC (LCOMPLEX + 1)
 } tspec_t;
 /*
  * size of types, name and classification
  */
 typedef	struct {
 	size_t	tt_sz;			/* size in bits */
 	size_t	tt_psz;			/* size, different from tt_sz
 					   if pflag is set */
-	tspec_t	tt_styp;		/* signed counterpart */
+	tspec_t	tt_signed_counterpart;
-	tspec_t	tt_utyp;		/* unsigned counterpart */
+	tspec_t	tt_unsigned_counterpart;
 	u_int	tt_is_int : 1;		/* 1 if integer type */
 	u_int	tt_is_uint : 1;		/* 1 if unsigned integer type */
 	u_int	tt_is_float : 1;	/* 1 if floating point type */
 	u_int	tt_is_arith : 1;	/* 1 if arithmetic type */
 	u_int	tt_is_scalar : 1;	/* 1 if scalar type */
 	u_int	tt_is_complex : 1;	/* 1 if complex type */
 	const char *tt_name;		/* name of the type */
 } ttab_t;
 #define size(t)			(ttab[t].tt_sz)
 #define psize(t)		(ttab[t].tt_psz)
-#define styp(t)			(ttab[t].tt_styp)
+#define signed_type(t)		(ttab[t].tt_signed_counterpart)
-#define utyp(t)			(ttab[t].tt_utyp)
+#define unsigned_type(t)	(ttab[t].tt_unsigned_counterpart)
 #define tspec_is_int(t)		(ttab[t].tt_is_int)
 #define tspec_is_uint(t)	(ttab[t].tt_is_uint)
 #define tspec_is_float(t)	(ttab[t].tt_is_float)
 #define tspec_is_arith(t)	(ttab[t].tt_is_arith)
 #define tspec_is_complex(t)	(ttab[t].tt_is_complex)
 #define tspec_is_scalar(t)	(ttab[t].tt_is_scalar)
 extern	ttab_t	ttab[];
 typedef	enum {
 	NODECL,			/* not declared until now */
 	DECL,			/* declared */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.113 2021/01/01 11:41:01 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.114 2021/01/01 11:58:03 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.113 2021/01/01 11:41:01 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.114 2021/01/01 11:58:03 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"
 @@ -1656,27 +1656,27 @@ balance(op_t op, tnode_t **lnp, tnode_t
+				}
 				t = tl[i];
+			}
+		}
 	} else {
 		/* Keep unsigned in traditional C */
 		u = tspec_is_uint(lt) || tspec_is_uint(rt);
 		for (i = 0; tl[i] != INT; i++) {
 			if (lt == tl[i] || rt == tl[i])
 				break;
+		}
 		t = tl[i];
 		if (u && tspec_is_int(t) && !tspec_is_uint(t))
-			t = utyp(t);
+			t = unsigned_type(t);
+	}
 	if (t != lt) {
 		ntp = tduptyp((*lnp)->tn_type);
 		ntp->t_tspec = t;
 		*lnp = convert(op, 0, ntp, *lnp);
+	}
 	if (t != rt) {
 		ntp = tduptyp((*rnp)->tn_type);
 		ntp->t_tspec = t;
 		*rnp = convert(op, 0, ntp, *rnp);
+	}
+}
 @@ -1765,27 +1765,27 @@ check_prototype_conversion(int arg, tspe
 		if (!tspec_is_int(ot) || psize(ot) > psize(INT)) {
 			/* conversion to '%s' due to prototype, arg #%d */
 			warning(259, tyname(buf, sizeof(buf), tp), arg);
+		}
 	} else if (hflag) {
 		/*
 		 * they differ in sign or base type (char, short, int,
 		 * long, long long, float, double, long double)
+		 *
 		 * if they differ only in sign and the argument is a constant
 		 * and the msb of the argument is not set, print no warning
 		 */
 		if (ptn->tn_op == CON && tspec_is_int(nt) &&
-		    styp(nt) == styp(ot) &&
+		    signed_type(nt) == signed_type(ot) &&
 		    msb(ptn->tn_val->v_quad, ot, -1) == 0) {
 			/* ok */
 		} else {
 			/* conversion to '%s' due to prototype, arg #%d */
 			warning(259, tyname(buf, sizeof(buf), tp), arg);
+		}
+	}
+}
 /*
  * Print warnings for conversions of integer types which may cause problems.
  */
 /* ARGSUSED */

 @@ -1,14 +1,14 @@
-/* $NetBSD: chk.c,v 1.29 2020/12/30 10:46:11 rillig Exp $ */
+/* $NetBSD: chk.c,v 1.30 2021/01/01 11:58:03 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: chk.c,v 1.29 2020/12/30 10:46:11 rillig Exp $");
+__RCSID("$NetBSD: chk.c,v 1.30 2021/01/01 11:58:03 rillig Exp $");
 #endif
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint2.h"
 static	void	chkund(hte_t *);
 static	void	chkdnu(hte_t *);
 static	void	chkdnud(hte_t *);
 static	void	chkmd(hte_t *);
 @@ -509,27 +509,27 @@ chkau(hte_t *hte, int n, sym_t *def, sym
 				t1 = DOUBLE;
 			} else if (t1 == CHAR || t1 == SCHAR) {
 				t1 = INT;
 			} else if (t1 == UCHAR) {
 				t1 = tflag ? UINT : INT;
 			} else if (t1 == SHORT) {
 				t1 = INT;
 			} else if (t1 == USHORT) {
 				/* CONSTCOND */
 				t1 = INT_MAX < USHRT_MAX || tflag ? UINT : INT;
+			}
+		}
-		if (styp(t1) == styp(t2)) {
+		if (signed_type(t1) == signed_type(t2)) {
 			/*
 			 * types differ only in signedness; get information
 			 * about arguments
 			 */
 			/*
 			 * treat a definition like a call with variable
 			 * arguments
 			 */
 			ai1 = call1 != NULL ? call1->f_args : NULL;
 			/*
 @@ -891,27 +891,27 @@ scanflike(hte_t *hte, fcall_t *call, int
 			if ((t1 = tp->t_tspec) == PTR)
 				t2 = tp->t_subt->t_tspec;
+		}
 		if (fc == 'd' || fc == 'i' || fc == 'n') {
 			if (sz == LDOUBLE)
 				badfmt(hte, call);
 			if (sz != SHORT && sz != LONG && sz != QUAD)
 				sz = INT;
 		conv:
 			if (!noasgn) {
 				if (t1 != PTR) {
 					inconarg(hte, call, n);
-				} else if (t2 != styp(sz)) {
+				} else if (t2 != signed_type(sz)) {
 					inconarg(hte, call, n);
 				} else if (hflag && t2 != sz) {
 					inconarg(hte, call, n);
 				} else if (tp->t_subt->t_const) {
 					inconarg(hte, call, n);
+				}
+			}
 		} else if (fc == 'o' || fc == 'u' || fc == 'x') {
 			if (sz == LDOUBLE)
 				badfmt(hte, call);
 			if (sz == SHORT) {
 				sz = USHORT;
 			} else if (sz == LONG) {
 @@ -1232,27 +1232,27 @@ eqtype(type_t *tp1, type_t *tp2, int ign
 		if (asgn && to == PTR) {
 			if (indir == 1 && (t == VOID || tp2->t_tspec == VOID))
 				return 1;
+		}
 		if (t != tp2->t_tspec) {
 			/*
 			 * Give pointer to types which differ only in
 			 * signedness a chance if not sflag and not hflag.
 			 */
 			if (sflag || hflag || to != PTR)
 				return 0;
-			if (styp(t) != styp(tp2->t_tspec))
+			if (signed_type(t) != signed_type(tp2->t_tspec))
 				return 0;
+		}
 		if (tp1->t_isenum && tp2->t_isenum) {
 			if (tp1->t_istag && tp2->t_istag) {
 				return tp1->t_tag == tp2->t_tag;
 			} else if (tp1->t_istynam && tp2->t_istynam) {
 				return tp1->t_tynam == tp2->t_tynam;
 			} else if (tp1->t_isuniqpos && tp2->t_isuniqpos) {
 				return (tp1->t_uniqpos.p_line ==
 				      tp2->t_uniqpos.p_line &&
 				    tp1->t_uniqpos.p_file ==
 				      tp2->t_uniqpos.p_file &&