Thu Jul 15 23:54:22 2021 UTC ()

lint: reduce verboseness of merge_signedness

No functional change.


(rillig)

diff -r1.206 -r1.207 src/usr.bin/xlint/lint1/decl.c

--- src/usr.bin/xlint/lint1/decl.c 2021/07/15 23:47:00	1.206
+++ src/usr.bin/xlint/lint1/decl.c 2021/07/15 23:54:22	1.207

 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.206 2021/07/15 23:47:00 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.207 2021/07/15 23:54:22 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.206 2021/07/15 23:47:00 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.207 2021/07/15 23:54:22 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;
 @@ -376,40 +376,36 @@ add_type(type_t *tp)
 		 */
 		if (dcs->d_abstract_type != NOTSPEC)
 			/* more than one, print error in end_type() */
 			dcs->d_terr = true;
 		dcs->d_abstract_type = t;
+	}
+}
 /* Merge the signedness into the abstract type. */
 static tspec_t
 merge_signedness(tspec_t t, tspec_t s)
+{
-	if (s != SIGNED && s != UNSIGN)
+	if (s == SIGNED)
 		return t == CHAR ? SCHAR : t;
 	if (s != UNSIGN)
 		return t;
 	return t == CHAR ? UCHAR
-	if (t == CHAR)
+	    : t == SHORT ? USHORT
-		return s == SIGNED ? SCHAR : UCHAR;
+	    : t == INT ? UINT
-	if (t == SHORT)
+	    : t == LONG ? ULONG
-		return s == SIGNED ? SHORT : USHORT;
+	    : t == QUAD ? UQUAD
-	if (t == INT)
+	    : t;
 		return s == SIGNED ? INT : UINT;
 	if (t == LONG)
 		return s == SIGNED ? LONG : ULONG;
 	if (t == QUAD)
 		return s == SIGNED ? QUAD : UQUAD;
 	return t;
+}
 /*
  * called if a list of declaration specifiers contains a typedef name
  * and other specifiers (except struct, union, enum, typedef name)
  */
 static type_t *
 tdeferr(type_t *td, tspec_t t)
+{
 	tspec_t	t2;
 	t2 = td->t_tspec;