 @@ -1,14 +1,14 @@
-/*	$NetBSD: queries.c,v 1.28 2024/04/27 10:08:54 rillig Exp $	*/
+/*	$NetBSD: queries.c,v 1.29 2024/04/27 12:46:37 rillig Exp $	*/
 # 3 "queries.c"
 /*
  * Demonstrate the case-by-case queries.  Unlike warnings, queries do not
  * point to questionable code but rather to code that may be interesting to
  * inspect manually on a case-by-case basis.
+ *
  * Possible use cases are:
+ *
  *	Understanding how C works internally, by making the usual arithmetic
  *	conversions visible.
+ *
  *	Finding code that intentionally suppresses a regular lint warning,
 @@ -522,14 +522,16 @@ Q20_void_pointer_conversion(void)
 	/* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
 	int_ptr = void_ptr;
 	/* expect+1: redundant cast from 'pointer to void' to 'pointer to int' before assignment [Q7] */
 	int_ptr = (int *)void_ptr;
 	/* expect+1: implicit narrowing conversion from void pointer to 'pointer to char' [Q20] */
 	char_ptr = void_ptr;
 	void_ptr = char_ptr;
 	/* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
 	int_ptr = void_ptr;
 	/* expect+1: warning: illegal combination of 'pointer to int' and 'pointer to char', op '=' [124] */
 	int_ptr = char_ptr;
 	/* expect+1: warning: illegal combination of 'pointer to char' and 'pointer to int', op '=' [124] */
 	char_ptr = int_ptr;
 	int_ptr = (void *)0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.637 2024/04/27 12:46:37 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)
-__RCSID("$NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.637 2024/04/27 12:46:37 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 typedef struct integer_constraints {
 @@ -1424,27 +1424,28 @@ build_assignment(op_t op, bool sys, tnod
 	    && portable_rank_cmp(lt, rt) < 0)
 		/* semantics of '%s' change in C90; ... */
 		warning(118, "<<=");
 	if (op != SHLASS && op != SHRASS
 	    && (op == ASSIGN || lt != PTR)
 	    && (lt != rt || (ln->tn_type->t_bitfield && rn->tn_op == CON))) {
 		rn = convert(op, 0, ln->tn_type, rn);
 		rt = lt;
+	}
 	if (is_query_enabled[20]
 	    && lt == PTR && ln->tn_type->t_subt->t_tspec != VOID
-	    && rt == PTR && rn->tn_type->t_subt->t_tspec == VOID)
+	    && rt == PTR && rn->tn_type->t_subt->t_tspec == VOID
 	    && !is_null_pointer(rn))
 		/* implicit narrowing conversion from void ... */
 		query_message(20, type_name(ln->tn_type));
 	if (any_query_enabled && rn->tn_op == CVT && rn->tn_cast &&
 	    types_compatible(ln->tn_type, rn->tn_type, false, false, NULL) &&
 	    is_cast_redundant(rn)) {
 		/* redundant cast from '%s' to '%s' before assignment */
 		query_message(7, type_name(rn->u.ops.left->tn_type),
 		    type_name(rn->tn_type));
+	}
 	return build_op(op, sys, ln->tn_type, ln, rn);
+}