 @@ -1,14 +1,14 @@
-/*	$NetBSD: tyname.c,v 1.21 2021/01/03 15:55:18 rillig Exp $	*/
+/*	$NetBSD: tyname.c,v 1.22 2021/01/04 22:26:50 rillig Exp $	*/
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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: tyname.c,v 1.21 2021/01/03 15:55:18 rillig Exp $");
+__RCSID("$NetBSD: tyname.c,v 1.22 2021/01/04 22:26:50 rillig Exp $");
 #endif
 #include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include <err.h>
 #include PASS
 #ifndef LERROR
 #define LERROR(fmt, args...) \
 	do { \
 		(void)warnx("%s, %d: " fmt, __FILE__, __LINE__, ##args); \
 @@ -270,27 +270,27 @@ type_name_of_function(buffer *buf, const
 			buf_add(buf, sep), sep = ", ";
 			buf_add(buf, type_name(arg->s_type));
+		}
 #else /* lint2 */
 		type_t **argtype;
 		for (argtype = tp->t_args; *argtype != NULL; argtype++) {
 			buf_add(buf, sep), sep = ", ";
 			buf_add(buf, type_name(*argtype));
+		}
 #endif
+	}
 	if (tp->t_vararg) {
-		buf_add(buf, sep), sep = ", ";
+		buf_add(buf, sep);
 		buf_add(buf, "...");
+	}
 	buf_add(buf, ") returning ");
 	buf_add(buf, type_name(tp->t_subt));
+}
 const char *
 type_name(const type_t *tp)
+{
 	tspec_t t;
 	buffer buf;
 	const char *name;

 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.110 2021/01/03 20:14:38 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.111 2021/01/04 22:26:50 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,39 +28,39 @@
  * 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.110 2021/01/03 20:14:38 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.111 2021/01/04 22:26:50 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 */
+/* shared type structures for arithmetic types and void */
 static	type_t	*typetab;
 /* value of next enumerator during declaration of enum types */
 int	enumval;
 /*
  * pointer to top element of a stack which contains information local
  * to nested declarations
  */
 dinfo_t	*dcs;
 static	type_t	*tdeferr(type_t *, tspec_t);
 static	void	settdsym(type_t *, sym_t *);
 @@ -662,27 +662,27 @@ popdecl(void)
 		/* FALLTHROUGH */
 	default:
 		lint_assert(/*CONSTCOND*/0);
+	}
 	free(di);
+}
 /*
  * Set flag d_asm in all declaration stack elements up to the
  * outermost one.
+ *
  * This is used to mark compound statements which have, possibly in
  * nested compound statements, asm statements. For these compound
- * statements no warnings about unused or unitialized variables are
+ * statements no warnings about unused or uninitialized variables are
  * printed.
+ *
  * There is no need to clear d_asm in dinfo structs with context AUTO,
  * because these structs are freed at the end of the compound statement.
  * But it must be cleared in the outermost dinfo struct, which has
  * context EXTERN. This could be done in clrtyp() and would work for
  * C, but not for C++ (due to mixed statements and declarations). Thus
  * we clear it in global_clean_up_decl(), which is used to do some cleanup
  * after global declarations/definitions.
  */
 void
 setasm(void)
+{
 @@ -867,27 +867,27 @@ merge_type_specifiers(tspec_t t, tspec_t
 		} else if (t == LONG) {
 			t = s == SIGNED ? LONG : ULONG;
 		} else if (t == QUAD) {
 			t = s == SIGNED ? QUAD : UQUAD;
+		}
+	}
 	return t;
+}
 /*
  * Return the length of a type in bits.
+ *
- * Printing a message if the outhermost dimension of an array is 0 must
+ * Printing a message if the outermost dimension of an array is 0 must
  * be done by the caller. All other problems are reported by length()
  * if name is not NULL.
  */
 int
 length(type_t *tp, const char *name)
+{
 	int	elem, elsz;
 	elem = 1;
 	while (tp && tp->t_tspec == ARRAY) {
 		elem *= tp->t_dim;
 		tp = tp->t_subt;
+	}
 @@ -967,27 +967,27 @@ lnklst(sym_t *l1, sym_t *l2)
 	if ((l = l1) == NULL)
 		return l2;
 	while (l1->s_next != NULL)
 		l1 = l1->s_next;
 	l1->s_next = l2;
 	return l;
+}
 /*
  * Check if the type of the given symbol is valid and print an error
  * message if it is not.
+ *
  * Invalid types are:
- * - arrays of incomlete types or functions
+ * - arrays of incomplete types or functions
  * - functions returning arrays or functions
  * - void types other than type of function or pointer
  */
 void
 check_type(sym_t *sym)
+{
 	tspec_t	to, t;
 	type_t	**tpp, *tp;
 	tpp = &sym->s_type;
 	to = NOTSPEC;
 	while ((tp = *tpp) != NULL) {
 		t = tp->t_tspec;
 @@ -1888,27 +1888,27 @@ decl1ext(sym_t *dsym, int initflg)
 	if (dcs->d_inline) {
 		if (dsym->s_type->t_tspec == FUNC) {
 			dsym->s_inline = 1;
 		} else {
 			/* variable declared inline: %s */
 			warning(268, dsym->s_name);
+		}
+	}
 	/* Write the declaration into the output file */
 	if (plibflg && llibflg &&
 	    dsym->s_type->t_tspec == FUNC && dsym->s_type->t_proto) {
 		/*
-		 * With both LINTLIBRARY and PROTOLIB the prototyp is
+		 * With both LINTLIBRARY and PROTOLIB the prototype is
 		 * written as a function definition to the output file.
 		 */
 		rval = dsym->s_type->t_subt->t_tspec != VOID;
 		outfdef(dsym, &dsym->s_def_pos, rval, 0, NULL);
 	} else {
 		outsym(dsym, dsym->s_scl, dsym->s_def);
+	}
 	if ((rdsym = dcs->d_rdcsym) != NULL) {
 		/*
 		 * If the old symbol stems from an old style function
 		 * definition, we have remembered the params in rdsmy->s_args

 @@ -1,14 +1,14 @@
-/* $NetBSD: emit1.c,v 1.33 2021/01/03 20:14:38 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.34 2021/01/04 22:26:50 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: emit1.c,v 1.33 2021/01/03 20:14:38 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.34 2021/01/04 22:26:50 rillig Exp $");
 #endif
 #include <ctype.h>
 #include "lint1.h"
 static	void	outtt(sym_t *, sym_t *);
 static	void	outfstrg(strg_t *);
 /*
  * Write type into the output buffer.
  * The type is written as a sequence of substrings, each of which describes a
  * node of type type_t
 @@ -78,27 +78,27 @@ static	void	outfstrg(strg_t *);
  *	(void)			F 0
  *	(n arguments)		F n arg1 arg2 ... argn
  *	(n arguments, ...)	F n arg1 arg2 ... argn-1 E
  *	(a, b, c, ...)		f n arg1 arg2 ...
  *	enum tag		e T tag_or_typename
  *	struct tag		s T tag_or_typename
  *	union tag		u T tag_or_typename
+ *
  *	tag_or_typename		0			no tag or type name
  *				1 n tag			Tag
  *				2 n typename		only type name
+ *
  * spaces are only for better readability
- * additionaly it is possible to prepend the characters 'c' (for const)
+ * additionally it is possible to prepend the characters 'c' (for const)
  * and 'v' (for volatile)
  */
 void
 outtype(type_t *tp)
+{
 	int	t, s, na;
 	sym_t	*arg;
 	tspec_t	ts;
 	while (tp != NULL) {
 		if ((ts = tp->t_tspec) == INT && tp->t_isenum)
 			ts = ENUM;
 		switch (ts) {
 @@ -391,27 +391,27 @@ outfdef(sym_t *fsym, pos_t *posp, int rv
 		outint(narg);
 		for (arg = args; arg != NULL; arg = arg->s_next)
 			outtype(arg->s_type);
 		outtype(fsym->s_type->t_subt);
 	} else {
 		outtype(fsym->s_type);
+	}
+}
 /*
  * write out all information necessary for lint2 to check function
  * calls
+ *
- * rvused is set if the return value is used (asigned to a variable)
+ * rvused is set if the return value is used (assigned to a variable)
  * rvdisc is set if the return value is not used and not ignored
  * (casted to void)
  */
 void
 outcall(tnode_t *tn, int rvused, int rvdisc)
+{
 	tnode_t	*args, *arg;
 	int	narg, n, i;
 	int64_t	q;
 	tspec_t	t;
 	/* reset buffer */
 	outclr();
 @@ -480,27 +480,27 @@ outcall(tnode_t *tn, int rvused, int rvd
 	outint(narg);
 	for (n = 1; n <= narg; n++) {
 		/* the last argument is the top one in the tree */
 		for (i = narg, arg = args; i > n; i--, arg = arg->tn_right)
 			continue;
 		outtype(arg->tn_left->tn_type);
+	}
 	/* expected type of return value */
 	outtype(tn->tn_type);
+}
 /*
  * extracts potential format specifiers for printf() and scanf() and
- * writes them, enclosed in "" and qouted if necessary, to the output buffer
+ * writes them, enclosed in "" and quoted if necessary, to the output buffer
  */
 static void
 outfstrg(strg_t *strg)
+{
 	int	c, oc, first;
 	u_char	*cp;
 	lint_assert(strg->st_tspec == CHAR);
 	cp = strg->st_cp;
 	outchar('"');

 @@ -1,14 +1,14 @@
-/*	$NetBSD: func.c,v 1.49 2021/01/03 20:14:38 rillig Exp $	*/
+/*	$NetBSD: func.c,v 1.50 2021/01/04 22:26:50 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,60 +27,60 @@
  * 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: func.c,v 1.49 2021/01/03 20:14:38 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.50 2021/01/04 22:26:50 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 /*
  * Contains a pointer to the symbol table entry of the current function
  * definition.
  */
 sym_t	*funcsym;
 /* Is set as long as a statement can be reached. Must be set at level 0. */
 int	reached = 1;
 /*
  * Is set as long as NOTREACHED is in effect.
  * Is reset everywhere where reached can become 0.
  */
 int	rchflg;
 /*
- * In conjunction with reached ontrols printing of "fallthrough on ..."
+ * In conjunction with reached, controls printing of "fallthrough on ..."
  * warnings.
  * Reset by each statement and set by FALLTHROUGH, switch (switch1())
  * and case (label()).
+ *
  * Control statements if, for, while and switch do not reset ftflg because
  * this must be done by the controlled statement. At least for if this is
  * important because ** FALLTHROUGH ** after "if (expr) stmnt" is evaluated
- * before the following token, wich causes reduction of above.
+ * before the following token, which causes reduction of above.
  * This means that ** FALLTHROUGH ** after "if ..." would always be ignored.
  */
 int	ftflg;
 /* The innermost control statement */
 cstk_t	*cstmt;
 /*
  * Number of arguments which will be checked for usage in following
  * function definition. -1 stands for all arguments.
+ *
  * The position of the last ARGSUSED comment is stored in argsused_pos.
  */
 @@ -284,28 +284,32 @@ funcdef(sym_t *fsym)
 	 */
 	dcs->d_fdpos = fsym->s_def_pos;
 	if ((rdsym = dcs->d_rdcsym) != NULL) {
 		if (!check_redeclaration(fsym, (dowarn = 0, &dowarn))) {
 			/*
 			 * Print nothing if the newly defined function
 			 * is defined in old style. A better warning will
 			 * be printed in check_func_lint_directives().
 			 */
 			if (dowarn && !fsym->s_osdef) {
-				/* redeclaration of %s */
+				if (sflag)
-				(*(sflag ? error : warning))(27, fsym->s_name);
+					/* redeclaration of %s */
 					error(27, fsym->s_name);
 				else
 					/* redeclaration of %s */
 					warning(27, fsym->s_name);
 				print_previous_declaration(-1, rdsym);
+			}
 			/* copy usage information */
 			copy_usage_info(fsym, rdsym);
 			/*
 			 * If the old symbol was a prototype and the new
 			 * one is none, overtake the position of the
 			 * declaration of the prototype.
 			 */
 			if (fsym->s_osdef && rdsym->s_type->t_proto)
 				fsym->s_def_pos = rdsym->s_def_pos;
 @@ -1178,27 +1182,27 @@ scanflike(int n)
 		/* must be outside function: ** %s ** */
 		warning(280, "SCANFLIKE");
 		return;
+	}
 	if (scanflike_argnum != -1) {
 		/* duplicate use of ** %s ** */
 		warning(281, "SCANFLIKE");
+	}
 	scanflike_argnum = n;
 	scanflike_pos = curr_pos;
+}
 /*
- * Set the linenumber for a CONSTCOND comment. At this and the following
+ * Set the line number for a CONSTCOND comment. At this and the following
  * line no warnings about constants in conditional contexts are printed.
  */
 /* ARGSUSED */
 void
 constcond(int n)
+{
 	constcond_flag = 1;
+}
 /*
  * Suppress printing of "fallthrough on ..." warnings until next
  * statement.

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.52 2021/01/03 20:04:08 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.53 2021/01/04 22:26:50 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
 @@ -41,29 +41,29 @@
  * not depend on the host settings but the target settings in determining
  * the alignment. The only valid use for this is in mem1.c; uses in decl.c
  * are bogus.
  */
 #ifndef WORST_ALIGN
 #ifdef _LP64
 # define AVAL	15
 #else
 # define AVAL	7
 #endif
 #define WORST_ALIGN(x) (((x) + AVAL) & ~AVAL)
 #endif
-#define LWARN_BAD	-3
+#define LWARN_BAD	(-3)
-#define LWARN_ALL	-2
+#define LWARN_ALL	(-2)
-#define LWARN_NONE	-1
+#define LWARN_NONE	(-1)
 /*
  * Describes the position of a declaration or anything else.
  */
 typedef struct {
 	int	p_line;
 	const	char *p_file;
 	int	p_uniq;			/* uniquifier */
 } pos_t;
 /* Copies curr_pos, keeping things unique. */
 #define	UNIQUE_CURR_POS(pos)						\
 	do {								\
 @@ -106,27 +106,27 @@ typedef struct {
 	tspec_t	v_tspec;
 	int	v_ansiu;		/* set if an integer constant is
 					   unsigned in ANSI C */
 	union {
 		int64_t	_v_quad;	/* integers */
 		ldbl_t	_v_ldbl;	/* floats */
 	} v_u;
 } val_t;
 #define v_quad	v_u._v_quad
 #define v_ldbl	v_u._v_ldbl
 /*
- * Structures of type str_t uniqely identify structures. This can't
+ * Structures of type str_t uniquely identify structures. This can't
  * be done in structures of type type_t, because these are copied
  * if they must be modified. So it would not be possible to check
  * if two structures are identical by comparing the pointers to
  * the type structures.
+ *
  * The typename is used if the structure is unnamed to identify
  * the structure type in pass 2.
  */
 typedef	struct {
 	u_int	size;		/* size in bit */
 	u_int	align : 15;	/* alignment in bit */
 	bool	sincompl : 1;	/* set if incomplete type */
 	struct	sym *memb;	/* list of members */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main1.c,v 1.31 2020/12/29 11:35:11 rillig Exp $	*/
+/*	$NetBSD: main1.c,v 1.32 2021/01/04 22:26:50 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,45 +27,45 @@
  * 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: main1.c,v 1.31 2020/12/29 11:35:11 rillig Exp $");
+__RCSID("$NetBSD: main1.c,v 1.32 2021/01/04 22:26:50 rillig Exp $");
 #endif
 #include <sys/types.h>
 #include <errno.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "lint1.h"
 /* set yydebug to 1*/
 int	yflag;
 /*
- * Print warnings if an assignment of an integertype to another integertype
+ * Print warnings if an assignment of an integer type to another integer type
  * causes an implicit narrowing conversion. If aflag is 1, these warnings
  * are printed only if the source type is at least as wide as long. If aflag
  * is greater than 1, they are always printed.
  */
 int	aflag;
 /* Print a warning if a break statement cannot be reached. */
 int	bflag;
 /* Print warnings for pointer casts. */
 int	cflag;
 /* Print various debug information. */

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: scan.l,v 1.111 2021/01/03 17:42:45 rillig Exp $ */
+/* $NetBSD: scan.l,v 1.112 2021/01/04 22:26:50 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.111 2021/01/03 17:42:45 rillig Exp $");
+__RCSID("$NetBSD: scan.l,v 1.112 2021/01/04 22:26:50 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"
 @@ -1330,27 +1330,27 @@ slashslashcomment(void)
  * the controlling expression and the body of control statements
  * (if, switch, for, while).
  */
 void
 clrwflgs(void)
+{
 	lwarn = LWARN_ALL;
 	quadflg = 0;
 	constcond_flag = 0;
+}
 /*
- * Strings are stored in a dynamically alloceted buffer and passed
+ * Strings are stored in a dynamically allocated buffer and passed
  * in yylval.y_xstrg to the parser. The parser or the routines called
  * by the parser are responsible for freeing this buffer.
  */
 static int
 string(void)
+{
 	u_char	*s;
 	int	c;
 	size_t	len, max;
 	strg_t	*strg;
 	s = xmalloc(max = 64);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.126 2021/01/04 21:30:06 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.127 2021/01/04 22:26:50 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.126 2021/01/04 21:30:06 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.127 2021/01/04 22:26:50 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"
 static	tnode_t	*new_integer_constant_node(tspec_t, int64_t);
 @@ -1335,27 +1335,27 @@ check_bad_enum_operation(op_t op, tnode_
 	if (!eflag)
 		return;
 	mp = &modtab[op];
 	if (!(ln->tn_type->t_isenum ||
 	      (mp->m_binary && rn->tn_type->t_isenum))) {
 		return;
+	}
 	/*
 	 * Enum as offset to a pointer is an exception (otherwise enums
-	 * could not be used as array indizes).
+	 * could not be used as array indices).
 	 */
 	if (op == PLUS &&
 	    ((ln->tn_type->t_isenum && rn->tn_type->t_tspec == PTR) ||
 	     (rn->tn_type->t_isenum && ln->tn_type->t_tspec == PTR))) {
 		return;
+	}
 	/* dubious operation on enum, op %s */
 	warning(241, mp->m_name);
+}
 /*

 @@ -1,14 +1,14 @@
-/* $NetBSD: chk.c,v 1.31 2021/01/02 03:49:26 rillig Exp $ */
+/* $NetBSD: chk.c,v 1.32 2021/01/04 22:26:51 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.31 2021/01/02 03:49:26 rillig Exp $");
+__RCSID("$NetBSD: chk.c,v 1.32 2021/01/04 22:26:51 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 *);
 @@ -271,27 +271,27 @@ chkvtui(hte_t *hte, sym_t *def, sym_t *d
 				 * behaviour matches pcc based lint, so it is
 				 * accepted for now.
 				 */
 				pos1 = xstrdup(mkpos(&def->s_pos));
 				/* %s value must be decl. before use %s :: %s */
 				msg(17, hte->h_name,
 				    pos1, mkpos(&call->f_pos));
 				free(pos1);
+			}
 			continue;
+		}
 		if (!eq || (sflag && dowarn)) {
 			pos1 = xstrdup(mkpos(&def->s_pos));
-			/* %s value used inconsistenty\t%s  ::  %s */
+			/* %s value used inconsistently\t%s  ::  %s */
 			msg(4, hte->h_name, pos1, mkpos(&call->f_pos));
 			free(pos1);
+		}
+	}
+}
 /*
  * Print a warning if a definition/declaration does not match another
  * definition/declaration of the same name. For functions, only the
  * types of return values are tested.
  */
 static void
 chkvtdi(hte_t *hte, sym_t *def, sym_t *decl)
 @@ -442,71 +442,71 @@ chkfaui(hte_t *hte, sym_t *def, sym_t *d
  *  arg2	currently checked argument of call
+ *
  */
 static void
 chkau(hte_t *hte, int n, sym_t *def, sym_t *decl, pos_t *pos1p,
 	fcall_t *call1, fcall_t *call, type_t *arg1, type_t *arg2)
+{
 	int	promote, asgn, dowarn;
 	tspec_t	t1, t2;
 	arginf_t *ai, *ai1;
 	char	*pos1;
 	/*
-	 * If a function definition is available (def != NULL), we compair the
+	 * If a function definition is available (def != NULL), we compare the
 	 * function call (call) with the definition. Otherwise, if a function
 	 * definition is available and it is not an old style definition
-	 * (decl != NULL && TP(decl->s_type)->t_proto), we compair the call
+	 * (decl != NULL && TP(decl->s_type)->t_proto), we compare the call
-	 * with this declaration. Otherwise we compair it with the first
+	 * with this declaration. Otherwise we compare it with the first
 	 * call we have found (call1).
 	 */
 	/* arg1 must be promoted if it stems from an old style definition */
 	promote = def != NULL && def->s_osdef;
 	/*
-	 * If we compair with a definition or declaration, we must perform
+	 * If we compare with a definition or declaration, we must perform
 	 * the same checks for qualifiers in indirected types as in
 	 * assignments.
 	 */
 	asgn = def != NULL || (decl != NULL && TP(decl->s_type)->t_proto);
 	dowarn = 0;
 	if (eqtype(arg1, arg2, 1, promote, asgn, &dowarn) && (!sflag || !dowarn))
 		return;
 	/*
 	 * Other lint implementations print warnings as soon as the type
 	 * of an argument does not match exactly the expected type. The
 	 * result are lots of warnings which are really not necessary.
 	 * We print a warning only if
-	 *   (0) at least one type is not an interger type and types differ
+	 *   (0) at least one type is not an integer type and types differ
 	 *   (1) hflag is set and types differ
 	 *   (2) types differ, except in signedness
 	 * If the argument is an integer constant whose msb is not set,
 	 * signedness is ignored (e.g. 0 matches both signed and unsigned
 	 * int). This is with and without hflag.
 	 * If the argument is an integer constant with value 0 and the
 	 * expected argument is of type pointer and the width of the
-	 * interger constant is the same as the width of the pointer,
+	 * integer constant is the same as the width of the pointer,
 	 * no warning is printed.
 	 */
 	t1 = arg1->t_tspec;
 	t2 = arg2->t_tspec;
 	if (tspec_is_int(t1) && tspec_is_int(t2) &&
 	    !arg1->t_isenum && !arg2->t_isenum) {
 		if (promote) {
 			/*
-			 * XXX Here is a problem: Althrough it is possible to
+			 * XXX Here is a problem: Although it is possible to
 			 * pass an int where a char/short it expected, there
 			 * may be loss in significant digits. We should first
 			 * check for const arguments if they can be converted
 			 * into the original parameter type.
 			 */
 			if (t1 == FLOAT) {
 				t1 = DOUBLE;
 			} else if (t1 == CHAR || t1 == SCHAR) {
 				t1 = INT;
 			} else if (t1 == UCHAR) {
 				t1 = tflag ? UINT : INT;
 			} else if (t1 == SHORT) {
 				t1 = INT;
 @@ -920,36 +920,36 @@ scanflike(hte_t *hte, fcall_t *call, int
 		} else if (fc == 'D') {
 			if (sz != NOTSPEC || !tflag)
 				badfmt(hte, call);
 			sz = LONG;
 			goto conv;
 		} else if (fc == 'O') {
 			if (sz != NOTSPEC || !tflag)
 				badfmt(hte, call);
 			sz = ULONG;
 			goto conv;
 		} else if (fc == 'X') {
 			/*
 			 * XXX valid in ANSI C, but in NetBSD's libc imple-
-			 * mented as "lx". Thats why it should be avoided.
+			 * mented as "lx". That's why it should be avoided.
 			 */
 			if (sz != NOTSPEC || !tflag)
 				badfmt(hte, call);
 			sz = ULONG;
 			goto conv;
 		} else if (fc == 'E') {
 			/*
 			 * XXX valid in ANSI C, but in NetBSD's libc imple-
-			 * mented as "lf". Thats why it should be avoided.
+			 * mented as "lf". That's why it should be avoided.
 			 */
 			if (sz != NOTSPEC || !tflag)
 				badfmt(hte, call);
 			sz = DOUBLE;
 			goto conv;
 		} else if (fc == 'F') {
 			/* XXX only for backward compatibility */
 			if (sz != NOTSPEC || !tflag)
 				badfmt(hte, call);
 			sz = DOUBLE;
 			goto conv;
 		} else if (fc == 'G') {
 			/*
 @@ -1069,27 +1069,27 @@ chkrvu(hte_t *hte, sym_t *def)
 	int	used, ignored;
 	if (def == NULL)
 		/* don't know whether or not the functions returns a value */
 		return;
 	if (hte->h_calls == NULL)
 		return;
 	if (def->s_rval) {
 		/*
 		 * XXX as soon as we are able to disable single warnings
 		 * the following dependencies from hflag should be removed.
-		 * but for now I do'nt want to be botherd by this warnings
+		 * but for now I don't want to be bothered by this warnings
 		 * which are almost always useless.
 		 */
 		if (hflag == 0)
 			return;
 		if (hflag == 1 && bsearch(hte->h_name, ignorelist,
 		    __arraycount(ignorelist), sizeof(ignorelist[0]),
 		    (int (*)(const void *, const void *))strcmp) != NULL)
 			return;
 		/* function has return value */
 		used = ignored = 0;
 		for (call = hte->h_calls; call != NULL; call = call->f_next) {
 			used |= call->f_rused || call->f_rdisc;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main2.c,v 1.9 2016/09/05 00:40:30 sevan Exp $	*/
+/*	$NetBSD: main2.c,v 1.10 2021/01/04 22:26:51 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: main2.c,v 1.9 2016/09/05 00:40:30 sevan Exp $");
+__RCSID("$NetBSD: main2.c,v 1.10 2021/01/04 22:26:51 rillig Exp $");
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "lint2.h"
 /* warnings for symbols which are declared but not defined or used */
 int	xflag;
 /*
 @@ -62,27 +62,27 @@ const	char *libname;
 int	pflag;
 /*
  * warnings for (tentative) definitions of the same name in more than
  * one translation unit
  */
 int	sflag;
 int	tflag;
 /*
  * If a complaint stems from a included file, print the name of the included
- * file instead of the name spezified at the command line followed by '?'
+ * file instead of the name specified at the command line followed by '?'
  */
 int	Hflag;
 int	hflag;
 /* Print full path names, not only the last component */
 int	Fflag;
 /*
  * List of libraries (from -l flag). These libraries are read after all
  * other input files has been read and, for Cflag, after the new lint library
  * has been written.
  */

 @@ -1,14 +1,14 @@
-/* $NetBSD: read.c,v 1.35 2021/01/01 11:51:15 rillig Exp $ */
+/* $NetBSD: read.c,v 1.36 2021/01/04 22:26:51 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,76 +28,76 @@
  * 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: read.c,v 1.35 2021/01/01 11:51:15 rillig Exp $");
+__RCSID("$NetBSD: read.c,v 1.36 2021/01/04 22:26:51 rillig Exp $");
 #endif
 #include <ctype.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint2.h"
 /* index of current (included) source file */
 static	int	srcfile;
 /*
  * The array pointed to by inpfns maps the file name indices of input files
  * to the file name indices used in lint2
  */
 static	short	*inpfns;
 static	size_t	ninpfns;
 /*
- * The array pointed to by *fnames maps file name indizes to file names.
+ * The array pointed to by *fnames maps file name indices to file names.
  * Indices of type short are used instead of pointers to save memory.
  */
 const	char **fnames;
 static	size_t *flines;
 static	size_t	nfnames;
 /*
  * Types are shared (to save memory for the types itself) and accessed
  * via indices (to save memory for references to types (indices are short)).
  * To share types, a equal type must be located fast. This is done by a
  * hash table. Access by indices is done via an array of pointers to the
  * types.
  */
 typedef struct thtab {
 	const	char *th_name;
 	u_short	th_idx;
 	struct	thtab *th_next;
 } thtab_t;
 static	thtab_t	**thtab;		/* hash table */
 type_t	**tlst;				/* array for indexed access */
 static	size_t	tlstlen;		/* length of tlst */
 static	hte_t **renametab;
-/* index of current C source file (as spezified at the command line) */
+/* index of current C source file (as specified at the command line) */
 static	int	csrcfile;
 #define		inperr(fmt, args...) \
 	inperror(__FILE__, __LINE__, fmt, ##args)
 static	void	inperror(const char *, size_t, const char *, ...);
 static	void	setsrc(const char *);
 static	void	setfnid(int, const char *);
 static	void	funccall(pos_t *, const char *);
 static	void	decldef(pos_t *, const char *);
 static	void	usedsym(pos_t *, const char *);
 static	u_short	inptype(const char *, const char **);
 static	int	gettlen(const char *, const char **);
 @@ -488,48 +488,48 @@ decldef(pos_t *posp, const char *cp)
 	 */
 	for (symp = hte->h_syms; symp != NULL; symp = symp->s_next) {
 		if (symp->s_pos.p_isrc == sym.s_pos.p_isrc &&
 		    symp->s_pos.p_iline == sym.s_pos.p_iline &&
 		    symp->s_type == sym.s_type &&
 		    ((symp->s_def == DECL && sym.s_def == DECL) ||
 		     (!sflag && symp->s_def == TDEF && sym.s_def == TDEF)) &&
 		    !symp->s_static && !sym.s_static) {
 			break;
+		}
+	}
 	if (symp == NULL) {
-		/* allocsym reserviert keinen Platz fuer s_nva */
+		/* allocsym does not reserve space for s_nva */
 		if (sym.s_va || sym.s_prfl || sym.s_scfl) {
 			symp = xalloc(sizeof (sym_t));
 			*symp = sym;
 		} else {
 			symp = xalloc(sizeof (symp->s_s));
 			symp->s_s = sym.s_s;
+		}
 		*hte->h_lsym = symp;
 		hte->h_lsym = &symp->s_next;
 		/* XXX hack so we can remember where a symbol was renamed */
 		if (renamed)
 			renamehte->h_syms = symp;
+	}
 	if (*cp != '\0')
 		inperr("trailing line: %s", cp);
+}
 /*
- * Read an u-record (emited by lint1 if a symbol was used).
+ * Read an u-record (emitted by lint1 if a symbol was used).
  */
 static void
 usedsym(pos_t *posp, const char *cp)
+{
 	usym_t	*usym;
 	hte_t	*hte;
 	const char *name;
 	usym = xalloc(sizeof (usym_t));
 	usym->u_pos = *posp;
 	/* needed as delimiter between two numbers */
 	if (*cp++ != 'x')

 @@ -1,14 +1,14 @@
-/* $NetBSD: xlint.c,v 1.51 2020/12/29 11:35:11 rillig Exp $ */
+/* $NetBSD: xlint.c,v 1.52 2021/01/04 22:26:51 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: xlint.c,v 1.51 2020/12/29 11:35:11 rillig Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.52 2021/01/04 22:26:51 rillig Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -72,27 +72,27 @@ static	int	cppoutfd = -1;
 /* files created by 1st pass */
 static	char	**p1out;
 /* input files for 2nd pass (without libraries) */
 static	char	**p2in;
 /* library which will be created by 2nd pass */
 static	char	*p2out;
 /* flags always passed to cc(1) */
 static	char	**cflags;
-/* flags for cc(1), controled by sflag/tflag */
+/* flags for cc(1), controlled by sflag/tflag */
 static	char	**lcflags;
 /* flags for lint1 */
 static	char	**l1flags;
 /* flags for lint2 */
 static	char	**l2flags;
 /* libraries for lint2 */
 static	char	**l2libs;
 /* default libraries */
 static	char	**deflibs;