 @@ -1,15 +1,15 @@
 #! /bin/sh
-# $NetBSD: t_misc.sh,v 1.6 2021/10/24 16:46:12 rillig Exp $
+# $NetBSD: t_misc.sh,v 1.7 2021/10/24 16:51:44 rillig Exp $
+#
 # Copyright (c) 2021 The NetBSD Foundation, Inc.
 # 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.
+#
 @@ -299,36 +299,38 @@ opt_U_body()
 	cat <<-\EOF > code.exp
 		int known_1 = (size_t)*arg;
 		int known_2 = (off_t)*arg;
 		int ignored = (ignored_t) * arg;
 	EOF
 	atf_check -o 'file:code.exp' \
 	    "$indent" -Ucode.types code.c -di0 -st
+}
 atf_test_case 'line_no_counting'
 line_no_counting_body()
+{
 	# Before NetBSD indent.c 1.147 from 2021-10-24, indent reported the
 	# warning in line 2 instead of the correct line 3.
 	cat <<-\EOF > code.c
 		void line_no_counting(void)
+		{
 			())
+		}
 	EOF
 	# FIXME: the wrong ')' is in line 3, not 2.
 	cat <<-\EOF > code.err
-		/**INDENT** Warning@2: Extra ) */
+		/**INDENT** Warning@3: Extra ) */
 	EOF
 	atf_check -o 'ignore' -e 'file:code.err' \
 	    "$indent" code.c -st
+}
 atf_init_test_cases()
+{
 	atf_add_test_case 'in_place'
 	atf_add_test_case 'verbose_profile'
 	atf_add_test_case 'nested_struct_declarations'
 	atf_add_test_case 'option_P_in_profile_file'
 	atf_add_test_case 'opt'

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.146 2021/10/24 11:19:25 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.147 2021/10/24 16:51:44 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1976 Board of Trustees of the University of Illinois.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  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
 @@ -33,27 +33,27 @@
  * 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 0
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.146 2021/10/24 11:19:25 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.147 2021/10/24 16:51:44 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
 #include <sys/param.h>
 #if HAVE_CAPSICUM
 #include <sys/capsicum.h>
 #include <capsicum_helpers.h>
 #endif
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -140,26 +140,28 @@ init_capsicum(void)
+}
 #endif
 static void
 search_brace_newline(bool *force_nl)
+{
     if (sc_end == NULL) {
 	save_com = sc_buf;
 	save_com[0] = save_com[1] = ' ';
 	sc_end = &save_com[2];
+    }
     *sc_end++ = '\n';
     line_no++;
     /*
      * We may have inherited a force_nl == true from the previous token (like
      * a semicolon). But once we know that a newline has been scanned in this
      * loop, force_nl should be false.
+     *
      * However, the force_nl == true must be preserved if newline is never
      * scanned in this loop, so this assignment cannot be done earlier.
      */
     *force_nl = false;
+}
 static void
 search_brace_comment(bool *comment_buffered)