 @@ -1,14 +1,14 @@
-/*	$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
  * 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)
-__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>
 #include <string.h>
 #include "lint.h"
 /* name and handle of output file */
 static	const	char *loname;
 static	FILE	*lout;
 /* output buffer data */
 static	ob_t	ob;
 @@ -102,27 +102,27 @@ outxbuf(void)
 /*
  * reset output buffer
  * if it is not empty, it is flushed
  */
 void
 outclr(void)
+{
 	size_t	sz;
 	if (ob.o_buf != ob.o_next) {
 		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;
+	}
+}
 /*
  * write a character to the output buffer
  */
 void
 outchar(char c)
+{

 @@ -1,14 +1,14 @@
-/* $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.
  * 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
 @@ -24,27 +24,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)
-__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"
 static	void	outtype(type_t *);
 static	void	outdef(hte_t *, sym_t *);
 static	void	dumpname(hte_t *);
 static	void	outfiles(void);
 /*
  * Write type into the output buffer.
  */
 static void
 @@ -84,27 +84,27 @@ outtype(type_t *tp)
 				outint(1);
 				outname(tp->t_tag->h_name);
 			} else if (tp->t_istynam) {
 				outint(2);
 				outname(tp->t_tynam->h_name);
 			} else if (tp->t_isuniqpos) {
 				outint(3);
 				outint(tp->t_uniqpos.p_line);
 				outchar('.');
 				outint(tp->t_uniqpos.p_file);
 				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++)
 				na++;
 			if (tp->t_vararg)
 				na++;
 			outint(na);
 			for (ap = tp->t_args; *ap != NULL; ap++)
 				outtype(*ap);
 			if (tp->t_vararg)
 				outchar('E');
+		}
 		tp = tp->t_subt;
 @@ -179,27 +179,27 @@ dumpname(hte_t *hte)
 	 * definition. This is necessary because more than one tentative
 	 * definition is allowed (except with sflag).
 	 */
 	def = NULL;
 	for (sym = hte->h_syms; sym != NULL; sym = sym->s_next) {
 		if (sym->s_def == DEF) {
 			def = sym;
 			break;
+		}
 		if (sym->s_def == TDEF && def == NULL)
 			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);
+}
 /*
  * Write a new lint library.
  */
 void
 outlib(const char *name)
+{
 	/* Open of output file and initialization of the output buffer */
 	outopen(name);

 @@ -1,14 +1,14 @@
-/* $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.
  * 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)
-__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>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint2.h"
 /* index of current (included) source file */
 @@ -295,27 +295,27 @@ setfnid(int fid, const char *cp)
 	if (fid < 0)
 		inperr("bad fid");
 	if ((size_t)fid >= ninpfns) {
 		inpfns = xrealloc(inpfns, (ninpfns * 2) * sizeof(*inpfns));
 		(void)memset(inpfns + ninpfns, 0, ninpfns * sizeof(*inpfns));
 		ninpfns *= 2;
+	}
 	/*
 	 * Should always be true because indices written in the output
 	 * 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);
+}
 /*
  * Process a function call record (c-record).
  */
 static void
 funccall(pos_t pos, const char *cp)
+{
 	arginf_t *ai, **lai;
 	char	c;
 	bool	rused, rdisc;
 	hte_t	*hte;