 @@ -1,28 +1,29 @@
-/*	$NetBSD: msg_135.c,v 1.8 2021/07/15 21:12:46 rillig Exp $	*/
+/*	$NetBSD: msg_135.c,v 1.9 2021/07/15 21:22:19 rillig Exp $	*/
 # 3 "msg_135.c"
 // Test for message: converting '%s' to '%s' may cause alignment problem [135]
 /* lint1-extra-flags: -h */
 void sink(const void *);
 unsigned
-read_uint(const unsigned char **pp)
+read_uint(const unsigned short **pp)
+{
 	unsigned val;
-	val = *(const unsigned *)(*pp);	/* expect: 135 */
+	/* expect+1: warning: converting 'pointer to const unsigned short' to 'pointer to const unsigned int' may cause alignment problem [135] */
 	val = *(const unsigned *)(*pp);
 	pp += sizeof(unsigned);
 	return val;
+}
 struct incomplete;	/* expect: never defined */
 struct complete {
     int member;
 };
 /*
  * These types of conversions are typically seen in OpenSSL, when converting
  * from the publicly visible, incomplete 'struct lhash_st' to a private
 @@ -33,34 +34,42 @@ struct complete {
  * resulting in many false positives.
+ *
  * See openssl/lhash.h.
  */
 void
 pointer_to_structs(struct incomplete *incomplete)
+{
 	struct complete *complete;
 	complete = (struct complete *)incomplete;
 	sink(complete);
+}
 /*
  * Before tree.c 1.316 from 2021-07-15, lint warned about pointer casts from
  * unsigned char or plain char to another type.  These casts often occur in
  * traditional code that does not use void pointers, even 30 years after C90
  * introduced 'void'.
  */
 void
 unsigned_char_to_unsigned_type(unsigned char *ucp)
+{
 	unsigned short *usp;
 	/* FIXME */
 	/* expect+1: warning: converting 'pointer to unsigned char' to 'pointer to unsigned short' may cause alignment problem [135] */
 	usp = (unsigned short *)ucp;
 	sink(usp);
+}
 /*
  * Before tree.c 1.316 from 2021-07-15, lint warned about pointer casts from
  * unsigned char or plain char to another type.  These casts often occur in
  * traditional code that does not use void pointers, even 30 years after C90
  * introduced 'void'.
  */
 void
 plain_char_to_unsigned_type(char *cp)
+{
 	unsigned short *usp;
 	/* FIXME */
 	/* expect+1: warning: converting 'pointer to char' to 'pointer to unsigned short' may cause alignment problem [135] */
 	usp = (unsigned short *)cp;
 	sink(usp);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_247.c,v 1.15 2021/07/15 21:12:46 rillig Exp $	*/
+/*	$NetBSD: msg_247.c,v 1.16 2021/07/15 21:22:19 rillig Exp $	*/
 # 3 "msg_247.c"
 // Test for message: pointer cast from '%s' to '%s' may be troublesome [247]
 /* lint1-extra-flags: -c */
 /* example taken from Xlib.h */
 typedef struct {
 	int id;
 } *PDisplay;
 struct Other {
 	int id;
 @@ -147,34 +147,42 @@ struct lhash_st_OPENSSL_STRING {
 struct lhash_st_OPENSSL_STRING *
 lh_OPENSSL_STRING_new(void)
+{
 	/*
 	 * Since tree.c 1.274 from 2021-04-09, lint does not warn about casts
 	 * to or from incomplete structs anymore.
 	 */
 	return (struct lhash_st_OPENSSL_STRING *)OPENSSL_LH_new();
+}
 # 157 "msg_247.c" 2
 void sink(const void *);
 /*
  * Before tree.c 1.316 from 2021-07-15, lint warned about pointer casts from
  * unsigned char or plain char to another type.  These casts often occur in
  * traditional code that does not use void pointers, even 30 years after C90
  * introduced 'void'.
  */
 void
 unsigned_char_to_unsigned_type(unsigned char *ucp)
+{
 	unsigned short *usp;
 	/* FIXME */
 	/* expect+1: warning: pointer cast from 'pointer to unsigned char' to 'pointer to unsigned short' may be troublesome [247] */
 	usp = (unsigned short *)ucp;
 	sink(usp);
+}
 /*
  * Before tree.c 1.316 from 2021-07-15, lint warned about pointer casts from
  * unsigned char or plain char to another type.  These casts often occur in
  * traditional code that does not use void pointers, even 30 years after C90
  * introduced 'void'.
  */
 void
 plain_char_to_unsigned_type(char *cp)
+{
 	unsigned short *usp;
 	/* FIXME */
 	/* expect+1: warning: pointer cast from 'pointer to char' to 'pointer to unsigned short' may be troublesome [247] */
 	usp = (unsigned short *)cp;
 	sink(usp);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.315 2021/07/15 17:03:50 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.316 2021/07/15 21:22:19 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: tree.c,v 1.315 2021/07/15 17:03:50 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.316 2021/07/15 21:22:19 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 static	tnode_t	*expr_new_integer_constant(tspec_t, int64_t);
 @@ -2070,26 +2070,28 @@ should_warn_about_pointer_cast(const typ
 	if (nst == STRUCT && ost == STRUCT &&
 	    nstp->t_str->sou_first_member != NULL &&
 	    nstp->t_str->sou_first_member->s_type == ostp)
 		return false;
 	if (is_incomplete(nstp) || is_incomplete(ostp))
 		return false;
 	if ((nst == STRUCT || nst == UNION) && nstp->t_str != ostp->t_str)
 		return true;
 	if (nst == CHAR || nst == UCHAR)
 		return false;	/* for the sake of traditional C code */
 	if (ost == CHAR || ost == UCHAR)
 		return false;	/* for the sake of traditional C code */
 	return portable_size_in_bits(nst) != portable_size_in_bits(ost);
+}
 /*
  * Warn about questionable pointer conversions.
  */
 static void
 check_pointer_conversion(tnode_t *tn, type_t *ntp)
+{
 	const type_t *nstp, *otp, *ostp;
 	tspec_t nst, ost;
 	const char *nts, *ots;
 @@ -2108,26 +2110,27 @@ check_pointer_conversion(tnode_t *tn, ty
 			/* ANSI C forbids conversion of %s to %s */
 			warning(303, ots, nts);
+		}
 		return;
 	} else if (nst == FUNC && ost == FUNC) {
 		return;
 	} else if (nst == FUNC || ost == FUNC) {
 		/* converting '%s' to '%s' is questionable */
 		warning(229, type_name(otp), type_name(ntp));
 		return;
+	}
 	if (hflag && alignment_in_bits(nstp) > alignment_in_bits(ostp) &&
 	    ost != CHAR && ost != UCHAR &&
 	    !is_incomplete(ostp)) {
 		/* converting '%s' to '%s' may cause alignment problem */
 		warning(135, type_name(otp), type_name(ntp));
+	}
 	if (cflag && should_warn_about_pointer_cast(nstp, nst, ostp, ost)) {
 		/* pointer cast from '%s' to '%s' may be troublesome */
 		warning(247, type_name(otp), type_name(ntp));
+	}
+}
 static void
 convert_constant_floating(op_t op, int arg, tspec_t ot, const type_t *tp,

 @@ -1,4 +1,2 @@
-msg_135.c(15): warning: converting 'pointer to const unsigned char' to 'pointer to const unsigned int' may cause alignment problem [135]
+msg_135.c(16): warning: converting 'pointer to const unsigned short' to 'pointer to const unsigned int' may cause alignment problem [135]
-msg_135.c(53): warning: converting 'pointer to unsigned char' to 'pointer to unsigned short' may cause alignment problem [135]
+msg_135.c(21): warning: struct incomplete never defined [233]
 msg_135.c(64): warning: converting 'pointer to char' to 'pointer to unsigned short' may cause alignment problem [135]
 msg_135.c(20): warning: struct incomplete never defined [233]

 @@ -1,5 +1,3 @@
 msg_247.c(31): warning: pointer cast from 'pointer to struct Other' to 'pointer to struct <unnamed>' may be troublesome [247]
 msg_247.c(70): warning: pointer cast from 'pointer to struct Other' to 'pointer to signed char' may be troublesome [247]
 msg_247.c(167): warning: pointer cast from 'pointer to unsigned char' to 'pointer to unsigned short' may be troublesome [247]
 msg_247.c(178): warning: pointer cast from 'pointer to char' to 'pointer to unsigned short' may be troublesome [247]
 msg_247.c(134): warning: struct lhash_st never defined [233]