Sun Mar 28 18:33:27 2021 UTC ()

lint: inline variable in initialization_init_array_using_string

No functional change.


(rillig)

diff -r1.170 -r1.171 src/usr.bin/xlint/lint1/init.c

--- src/usr.bin/xlint/lint1/init.c 2021/03/28 18:28:22	1.170
+++ src/usr.bin/xlint/lint1/init.c 2021/03/28 18:33:27	1.171

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.170 2021/03/28 18:28:22 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.171 2021/03/28 18:33:27 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: init.c,v 1.170 2021/03/28 18:28:22 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.171 2021/03/28 18:33:27 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -1169,27 +1169,26 @@ is_string_array(const type_t *tp, tspec_
 	if (tp == NULL || tp->t_tspec != ARRAY)
 		return false;
 	st = tp->t_subt->t_tspec;
 	return t == CHAR
 	    ? st == CHAR || st == UCHAR || st == SCHAR
 	    : st == WCHAR;
+}
 /* Initialize a character array or wchar_t array with a string literal. */
 static bool
 initialization_init_array_using_string(struct initialization *in, tnode_t *tn)
+{
 	struct brace_level *level;
 	int	len;
 	strg_t	*strg;
 	if (tn->tn_op != STRING)
 		return false;
 	debug_enter();
 	level = in->brace_level;
 	strg = tn->tn_string;
 	/*
 	 * Check if we have an array type which can be initialized by
 	 * the string.
 @@ -1203,40 +1202,37 @@ initialization_init_array_using_string(s
 	} else if (is_string_array(level->bl_type, strg->st_tspec)) {
 		debug_step("type is an array");
 		/*
 		 * If the array is already partly initialized, we are
 		 * wrong here.
 		 */
 		if (level->bl_remaining != level->bl_type->t_dim)
 			goto nope;
 	} else
 		goto nope;
 	/* Get length without trailing NUL character. */
 	len = strg->st_len;
 	if (level->bl_array_of_unknown_size) {
 		level->bl_array_of_unknown_size = false;
-		level->bl_type->t_dim = len + 1;
+		level->bl_type->t_dim = (int)(strg->st_len + 1);
 		setcomplete(level->bl_type, true);
 	} else {
 		/*
 		 * TODO: check for buffer overflow in the object to be
 		 * initialized
 		 */
 		/* XXX: double-check for off-by-one error */
-		if (level->bl_type->t_dim < len) {
+		if (level->bl_type->t_dim < (int)strg->st_len) {
 			/* non-null byte ignored in string initializer */
 			warning(187);
+		}
 		/*
 		 * TODO: C99 6.7.8p14 allows a string literal to be enclosed
 		 * in optional redundant braces, just like scalars.  Add tests
 		 * for this.
 		 */
+	}
 	/* In every case the array is initialized completely. */
 	level->bl_remaining = 0;