 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.100 2021/01/02 17:17:00 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.101 2021/01/02 18:06:01 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.100 2021/01/02 17:17:00 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.101 2021/01/02 18:06:01 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 */
 static	type_t	*typetab;
 @@ -377,36 +377,36 @@ add_type(type_t *tp)
 static type_t *
 tdeferr(type_t *td, tspec_t t)
+{
 	tspec_t	t2;
 	t2 = td->t_tspec;
 	switch (t) {
 	case SIGNED:
 	case UNSIGN:
 		if (t2 == CHAR || t2 == SHORT || t2 == INT || t2 == LONG ||
 		    t2 == QUAD) {
 			if (!tflag)
-				/* modifying typedef with ... */
+				/* modifying typedef with '%s'; only ... */
 				warning(5, ttab[t].tt_name);
 			td = duptyp(gettyp(merge_type_specifiers(t2, t)));
 			td->t_typedef = 1;
 			return td;
+		}
 		break;
 	case SHORT:
 		if (t2 == INT || t2 == UINT) {
-			/* modifying typedef with ... */
+			/* modifying typedef with '%s'; only qualifiers ... */
 			warning(5, "short");
 			td = duptyp(gettyp(t2 == INT ? SHORT : USHORT));
 			td->t_typedef = 1;
 			return td;
+		}
 		break;
 	case LONG:
 		if (t2 == INT || t2 == UINT || t2 == LONG || t2 == ULONG ||
 		    t2 == FLOAT || t2 == DOUBLE || t2 == DCOMPLEX) {
 			/* modifying typedef with ... */
 			warning(5, "long");
 			if (t2 == INT) {
 				td = gettyp(LONG);

 @@ -1,7 +1,10 @@
-/*	$NetBSD: msg_000.c,v 1.1 2021/01/02 10:22:42 rillig Exp $	*/
+/*	$NetBSD: msg_000.c,v 1.2 2021/01/02 18:06:01 rillig Exp $	*/
 # 3 "msg_000.c"
 // Test for message: empty declaration [0]
-TODO: "Add example code that triggers the above message."
+extern int extern_declared;
 TODO: "Add example code that almost triggers the above message."
+;
 static int local_defined;

 @@ -1,7 +1,8 @@
-/*	$NetBSD: msg_001.c,v 1.1 2021/01/02 10:22:42 rillig Exp $	*/
+/*	$NetBSD: msg_001.c,v 1.2 2021/01/02 18:06:01 rillig Exp $	*/
 # 3 "msg_001.c"
 // Test for message: old style declaration; add int [1]
-TODO: "Add example code that triggers the above message."
+old_style = 1;
 TODO: "Add example code that almost triggers the above message."
 int new_style = 1;

 @@ -1,7 +1,8 @@
-/*	$NetBSD: msg_002.c,v 1.1 2021/01/02 10:22:42 rillig Exp $	*/
+/*	$NetBSD: msg_002.c,v 1.2 2021/01/02 18:06:01 rillig Exp $	*/
 # 3 "msg_002.c"
 // Test for message: empty declaration [2]
-TODO: "Add example code that triggers the above message."
+int;
 TODO: "Add example code that almost triggers the above message."
 int local_variable;

 @@ -1,7 +1,21 @@
-/*	$NetBSD: msg_004.c,v 1.1 2021/01/02 10:22:42 rillig Exp $	*/
+/*	$NetBSD: msg_004.c,v 1.2 2021/01/02 18:06:01 rillig Exp $	*/
 # 3 "msg_004.c"
 // Test for message: illegal type combination [4]
-TODO: "Add example code that triggers the above message."
+// XXX: this goes undetected
-TODO: "Add example code that almost triggers the above message."
+signed double signed_double;
 int ok_int;
 double ok_double;
 float _Complex ok_float_complex;
 int _Complex illegal_int_complex;
 char enum {
 	CHAR
 };
 long struct {
 	int member;
 };

 @@ -1,7 +1,8 @@
-/*	$NetBSD: msg_005.c,v 1.1 2021/01/02 10:22:42 rillig Exp $	*/
+/*	$NetBSD: msg_005.c,v 1.2 2021/01/02 18:06:01 rillig Exp $	*/
 # 3 "msg_005.c"
 // Test for message: modifying typedef with '%s'; only qualifiers allowed [5]
-TODO: "Add example code that triggers the above message."
+typedef int number;
-TODO: "Add example code that almost triggers the above message."
+number long long_variable;
 number const const_variable;

 @@ -1,7 +1,9 @@
-/*	$NetBSD: msg_085.c,v 1.1 2021/01/02 10:22:43 rillig Exp $	*/
+/*	$NetBSD: msg_085.c,v 1.2 2021/01/02 18:06:01 rillig Exp $	*/
 # 3 "msg_085.c"
 // Test for message: dubious tag declaration: %s %s [85]
-TODO: "Add example code that triggers the above message."
+extern int stat(struct stat *);
 TODO: "Add example code that almost triggers the above message."
 struct ok;
 extern int ok(struct ok *);