Module Name: src
Committed By: rillig
Date: Mon Feb 6 21:01:56 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: t_integration.sh
src/usr.bin/xlint/lint1: cgram.y externs1.h init.c
Log Message:
lint: eliminate unnecessary indirection
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/tests/usr.bin/xlint/lint1/t_integration.sh
cvs rdiff -u -r1.432 -r1.433 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.239 -r1.240 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/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.76 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.77
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.76 Fri Jun 17 20:24:00 2022
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh Mon Feb 6 21:01:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.76 2022/06/17 20:24:00 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.77 2023/02/06 21:01:55 rillig Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -131,8 +131,7 @@ check_lint1()
fi
# shellcheck disable=SC2086
- # XXX: -s 'exit:any' would be better
- atf_check -s 'ignore' -o "save:$exp" \
+ atf_check -s 'exit' -o "save:$exp" \
"$lint1" $flags "$src" "$wrk_ln"
atf_check lua "$(atf_get_srcdir)/check-expect.lua" "$src"
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.432 src/usr.bin/xlint/lint1/cgram.y:1.433
--- src/usr.bin/xlint/lint1/cgram.y:1.432 Sun Jan 29 18:13:56 2023
+++ src/usr.bin/xlint/lint1/cgram.y Mon Feb 6 21:01:55 2023
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.432 2023/01/29 18:13:56 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.433 2023/02/06 21:01:55 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.432 2023/01/29 18:13:56 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.433 2023/02/06 21:01:55 rillig Exp $");
#endif
#include <limits.h>
@@ -470,7 +470,7 @@ postfix_expression:
if (!allow_c99)
/* compound literals are a C99/GCC extension */
gnuism(319);
- $$ = build_name(*current_initsym(), false);
+ $$ = build_name(current_initsym(), false);
end_initialization();
}
| T_LPAREN compound_statement_lbrace {
Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.172 src/usr.bin/xlint/lint1/externs1.h:1.173
--- src/usr.bin/xlint/lint1/externs1.h:1.172 Sun Jan 29 18:13:56 2023
+++ src/usr.bin/xlint/lint1/externs1.h Mon Feb 6 21:01:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.172 2023/01/29 18:13:56 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.173 2023/02/06 21:01:55 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -344,7 +344,7 @@ extern void bitfieldtype(int);
*/
extern void begin_initialization(sym_t *);
extern void end_initialization(void);
-extern sym_t **current_initsym(void);
+extern sym_t *current_initsym(void);
extern void init_rbrace(void);
extern void init_lbrace(void);
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.239 src/usr.bin/xlint/lint1/init.c:1.240
--- src/usr.bin/xlint/lint1/init.c:1.239 Mon Feb 6 20:50:34 2023
+++ src/usr.bin/xlint/lint1/init.c Mon Feb 6 21:01:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.239 2023/02/06 20:50:34 rillig Exp $ */
+/* $NetBSD: init.c,v 1.240 2023/02/06 21:01:55 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: init.c,v 1.239 2023/02/06 20:50:34 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.240 2023/02/06 21:01:55 rillig Exp $");
#endif
#include <stdlib.h>
@@ -1003,11 +1003,11 @@ done:
static initialization *init;
-sym_t **
+sym_t *
current_initsym(void)
{
- return &init->in_sym;
+ return init->in_sym;
}
void
