Module Name: src
Committed By: rillig
Date: Sun Mar 28 16:28:15 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: init.c
Log Message:
lint: extract brace_level_subtype
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/usr.bin/xlint/lint1/init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.165 src/usr.bin/xlint/lint1/init.c:1.166
--- src/usr.bin/xlint/lint1/init.c:1.165 Sun Mar 28 16:19:21 2021
+++ src/usr.bin/xlint/lint1/init.c Sun Mar 28 16:28:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.165 2021/03/28 16:19:21 rillig Exp $ */
+/* $NetBSD: init.c,v 1.166 2021/03/28 16:28:15 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.165 2021/03/28 16:19:21 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.166 2021/03/28 16:28:15 rillig Exp $");
#endif
#include <stdlib.h>
@@ -474,13 +474,15 @@ designation_shift_level(struct designati
static struct brace_level *
-brace_level_new(type_t *type, type_t *subtype, int remaining)
+brace_level_new(type_t *type, type_t *subtype, int remaining,
+ struct brace_level *enclosing)
{
struct brace_level *level = xcalloc(1, sizeof(*level));
level->bl_type = type;
level->bl_subtype = subtype;
level->bl_remaining = remaining;
+ level->bl_enclosing = enclosing;
return level;
}
@@ -526,6 +528,16 @@ brace_level_debug(const struct brace_lev
#define brace_level_debug(level) do { } while (false)
#endif
+static type_t *
+brace_level_subtype(struct brace_level *level)
+{
+
+ if (level->bl_subtype != NULL)
+ return level->bl_subtype;
+
+ return level->bl_type;
+}
+
static void
brace_level_set_array_dimension(struct brace_level *level, int dim)
{
@@ -776,7 +788,7 @@ initialization_init(struct initializatio
in->initsym->s_type = duptyp(in->initsym->s_type);
/* TODO: does 'duptyp' create a memory leak? */
- in->brace_level = brace_level_new(NULL, in->initsym->s_type, 1);
+ in->brace_level = brace_level_new(NULL, in->initsym->s_type, 1, NULL);
initialization_debug(in);
debug_leave();
@@ -867,10 +879,8 @@ initialization_push(struct initializatio
level = in->brace_level;
lint_assert(level->bl_remaining > 0);
- in->brace_level = brace_level_new(
- level->bl_subtype != NULL ? level->bl_subtype : level->bl_type,
- NULL, 0);
- in->brace_level->bl_enclosing = level;
+ in->brace_level = brace_level_new(brace_level_subtype(level), NULL, 0,
+ level);
lint_assert(in->brace_level->bl_type != NULL);
lint_assert(in->brace_level->bl_type->t_tspec != FUNC);
