 @@ -72,16 +72,16 @@ msg_193.c(468): warning: statement not r
 msg_193.c(470): warning: statement not reached [193]
 msg_193.c(479): warning: statement not reached [193]
 msg_193.c(481): warning: statement not reached [193]
 msg_193.c(486): warning: statement not reached [193]
 msg_193.c(488): warning: statement not reached [193]
 msg_193.c(490): warning: statement not reached [193]
 msg_193.c(497): warning: statement not reached [193]
 msg_193.c(500): warning: statement not reached [193]
 msg_193.c(503): warning: statement not reached [193]
 msg_193.c(515): warning: statement not reached [193]
 msg_193.c(518): warning: statement not reached [193]
 msg_193.c(532): warning: statement not reached [193]
 msg_193.c(540): warning: statement not reached [193]
-msg_193.c(580): warning: label six unused in function test_goto_numbers_alphabetically [232]
+msg_193.c(580): warning: label 'six' unused in function 'test_goto_numbers_alphabetically' [232]
 msg_193.c(597): warning: statement not reached [193]
 msg_193.c(606): warning: statement not reached [193]

 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.197 2021/07/10 17:35:54 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.198 2021/07/11 19:30:56 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.197 2021/07/10 17:35:54 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.198 2021/07/11 19:30:56 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 arithmetic types and void */
 static	type_t	*typetab;
 @@ -3121,30 +3121,30 @@ check_variable_usage(bool novar, sym_t *
+			}
+		}
+	}
+}
 static void
 check_label_usage(sym_t *lab)
+{
 	lint_assert(block_level == 1);
 	lint_assert(lab->s_block_level == 1);
 	if (lab->s_set && !lab->s_used) {
-		/* label %s unused in function %s */
+		/* label '%s' unused in function '%s' */
 		warning_at(232, &lab->s_set_pos, lab->s_name, funcsym->s_name);
 	} else if (!lab->s_set) {
-		/* undefined label %s */
+		/* undefined label '%s' */
 		warning_at(23, &lab->s_use_pos, lab->s_name);
+	}
+}
 static void
 check_tag_usage(sym_t *sym)
+{
 	if (!is_incomplete(sym->s_type))
 		return;
 	/* always complain about incomplete tags declared inside blocks */
 	if (!zflag || dcs->d_ctx != EXTERN)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.127 2021/07/10 12:17:31 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.128 2021/07/11 19:30:56 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.127 2021/07/10 12:17:31 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.128 2021/07/11 19:30:56 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;
 @@ -67,27 +67,27 @@ const char *const msgs[] = {
 	"duplicate '%s'",					      /* 10 */
 	"bit-field initializer out of range",			      /* 11 */
 	"compiler takes size of function",			      /* 12 */
 	"incomplete enum type: %s",				      /* 13 */
 	"compiler takes alignment of function",			      /* 14 */
 	"function returns illegal type",			      /* 15 */
 	"array of function is illegal",				      /* 16 */
 	"null dimension",					      /* 17 */
 	"illegal use of 'void'",				      /* 18 */
 	"void type for '%s'",					      /* 19 */
 	"negative array dimension (%d)",			      /* 20 */
 	"redeclaration of formal parameter %s",			      /* 21 */
 	"incomplete or misplaced function definition",		      /* 22 */
-	"undefined label %s",					      /* 23 */
+	"undefined label '%s'",					      /* 23 */
 	"cannot initialize function: %s",			      /* 24 */
 	"cannot initialize typedef: %s",			      /* 25 */
 	"cannot initialize extern declaration: %s",		      /* 26 */
 	"redeclaration of %s",					      /* 27 */
 	"redefinition of %s",					      /* 28 */
 	"previously declared extern, becomes static: %s",	      /* 29 */
 	"redeclaration of %s; ANSI C requires static",		      /* 30 */
 	"argument '%s' has type '%s'",				      /* 31 */
 	"argument type defaults to 'int': %s",			      /* 32 */
 	"duplicate member name: %s",				      /* 33 */
 	"nonportable bit-field type '%s'",			      /* 34 */
 	"illegal bit-field type '%s'",				      /* 35 */
 	"illegal bit-field size: %d",				      /* 36 */
 @@ -276,27 +276,27 @@ const char *const msgs[] = {
 	"concatenated strings are illegal in traditional C",	      /* 219 */
 	"fallthrough on case statement",			      /* 220 */
 	"initialization of unsigned with negative constant",	      /* 221 */
 	"conversion of negative constant to unsigned type",	      /* 222 */
 	"end-of-loop code not reached",				      /* 223 */
 	"cannot recover from previous errors",			      /* 224 */
 	"static function called but not defined: %s()",		      /* 225 */
 	"static variable %s unused",				      /* 226 */
 	"const object %s should have initializer",		      /* 227 */
 	"function cannot return const or volatile object",	      /* 228 */
 	"converting '%s' to '%s' is questionable",		      /* 229 */
 	"nonportable character comparison, op %s",		      /* 230 */
 	"argument '%s' unused in function '%s'",		      /* 231 */
-	"label %s unused in function %s",			      /* 232 */
+	"label '%s' unused in function '%s'",			      /* 232 */
 	"struct %s never defined",				      /* 233 */
 	"union %s never defined",				      /* 234 */
 	"enum %s never defined",				      /* 235 */
 	"static function %s unused",				      /* 236 */
 	"redeclaration of formal parameter %s",			      /* 237 */
 	"initialization of union is illegal in traditional C",	      /* 238 */
 	"constant argument to '!'",				      /* 239 */
 	"assignment of different structures (%s != %s)",	      /* 240 */
 	"dubious operation on enum, op %s",			      /* 241 */
 	"combination of '%s' and '%s', op %s",			      /* 242 */
 	"dubious comparison of enums, op %s",			      /* 243 */
 	"illegal structure pointer combination",		      /* 244 */
 	"incompatible structure pointers: '%s' '%s' '%s'",	      /* 245 */

 @@ -1,14 +1,13 @@
-/*	$NetBSD: msg_023.c,v 1.3 2021/07/11 19:24:42 rillig Exp $	*/
+/*	$NetBSD: msg_023.c,v 1.4 2021/07/11 19:30:56 rillig Exp $	*/
 # 3 "msg_023.c"
-// Test for message: undefined label %s [23]
+// Test for message: undefined label '%s' [23]
 void
 test(void)
+{
 	goto defined_label;
 defined_label:
-	/* TODO: add quotes around '%s' */
+	/* expect+1: warning: undefined label 'undefined_label' [23] */
 	/* expect+1: warning: undefined label undefined_label [23] */
 	goto undefined_label;
+}

 @@ -1,2 +1,2 @@
 msg_194.c(11): error: label label redefined [194]
-msg_194.c(9): warning: label label unused in function example [232]
+msg_194.c(9): warning: label 'label' unused in function 'example' [232]

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_193.c,v 1.11 2021/03/21 20:08:21 rillig Exp $	*/
+/*	$NetBSD: msg_193.c,v 1.12 2021/07/11 19:30:56 rillig Exp $	*/
 # 3 "msg_193.c"
 // Test for message: statement not reached [193]
 /*
  * Test the reachability of statements in a function.
+ *
  *	if
  *	if-else
  *	if-else-if-else
  *	for
  *	while
  *	do-while
 @@ -567,27 +567,27 @@ test_goto_numbers_alphabetically(void)
 	goto one;
 eight:
 	goto nine;
 five:
 	return;
 four:
 	goto five;
 nine:
 	goto ten;
 one:
 	goto two;
 seven:
 	goto eight;
-six:				/* expect: warning: label six unused */
+six:				/* expect: warning: label 'six' unused */
 	goto seven;
 ten:
 	return;
 three:
 	goto four;
 two:
 	goto three;
+}
 void
 test_while_goto(void)
+{
 	while (1) {

 @@ -1,16 +1,15 @@
-/*	$NetBSD: msg_232.c,v 1.4 2021/07/11 19:24:42 rillig Exp $	*/
+/*	$NetBSD: msg_232.c,v 1.5 2021/07/11 19:30:56 rillig Exp $	*/
 # 3 "msg_232.c"
-// Test for message: label %s unused in function %s [232]
+// Test for message: label '%s' unused in function '%s' [232]
 void
 example(void)
+{
 	goto used_label;
-unused_label:			/* expect: 232 */
+	/* expect+1: label 'unused_label' unused in function 'example' [232] */
 unused_label:
 	return;
 used_label:
 	return;
+}
 /* TODO: add quotes around '%s' */