Module Name: src
Committed By: rillig
Date: Fri Jun 9 13:03:49 UTC 2023
Modified Files:
src/usr.bin/xlint/common: emit.c inittyp.c
src/usr.bin/xlint/lint1: decl.c emit1.c err.c func.c lex.c tree.c
src/usr.bin/xlint/lint2: chk.c emit2.c hash.c main2.c msg.c read.c
src/usr.bin/xlint/xlint: xlint.c
Log Message:
lint: indent local variables consistently
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/xlint/common/emit.c
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/xlint/common/inittyp.c
cvs rdiff -u -r1.315 -r1.316 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.197 -r1.198 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.154 -r1.155 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.158 -r1.159 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.525 -r1.526 src/usr.bin/xlint/lint1/tree.c
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xlint/lint2/emit2.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/xlint/lint2/hash.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/xlint/lint2/main2.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/xlint/lint2/msg.c
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/xlint/lint2/read.c
cvs rdiff -u -r1.109 -r1.110 src/usr.bin/xlint/xlint/xlint.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/common/emit.c
diff -u src/usr.bin/xlint/common/emit.c:1.18 src/usr.bin/xlint/common/emit.c:1.19
--- src/usr.bin/xlint/common/emit.c:1.18 Sat Jan 14 09:30:07 2023
+++ src/usr.bin/xlint/common/emit.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: emit.c,v 1.18 2023/01/14 09:30:07 rillig Exp $ */
+/* $NetBSD: emit.c,v 1.19 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: emit.c,v 1.18 2023/01/14 09:30:07 rillig Exp $");
+__RCSID("$NetBSD: emit.c,v 1.19 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <stdio.h>
@@ -106,7 +106,7 @@ outxbuf(void)
void
outclr(void)
{
- size_t sz;
+ size_t sz;
if (ob.o_buf != ob.o_next) {
outchar('\n');
Index: src/usr.bin/xlint/common/inittyp.c
diff -u src/usr.bin/xlint/common/inittyp.c:1.34 src/usr.bin/xlint/common/inittyp.c:1.35
--- src/usr.bin/xlint/common/inittyp.c:1.34 Mon May 22 12:55:04 2023
+++ src/usr.bin/xlint/common/inittyp.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: inittyp.c,v 1.34 2023/05/22 12:55:04 rillig Exp $ */
+/* $NetBSD: inittyp.c,v 1.35 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: inittyp.c,v 1.34 2023/05/22 12:55:04 rillig Exp $");
+__RCSID("$NetBSD: inittyp.c,v 1.35 2023/06/09 13:03:49 rillig Exp $");
#endif
#if defined(IS_LINT1)
@@ -128,7 +128,7 @@ ttab_t ttab[NTSPEC] = {
void
inittyp(void)
{
- size_t i;
+ size_t i;
if (!pflag) {
for (i = 0; i < NTSPEC; i++)
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.315 src/usr.bin/xlint/lint1/decl.c:1.316
--- src/usr.bin/xlint/lint1/decl.c:1.315 Sat Jun 3 21:08:06 2023
+++ src/usr.bin/xlint/lint1/decl.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.315 2023/06/03 21:08:06 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.316 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.315 2023/06/03 21:08:06 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.316 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <sys/param.h>
@@ -152,7 +152,7 @@ gettyp(tspec_t t)
type_t *
block_dup_type(const type_t *tp)
{
- type_t *ntp;
+ type_t *ntp;
ntp = block_zero_alloc(sizeof(*ntp));
*ntp = *tp;
@@ -163,7 +163,7 @@ block_dup_type(const type_t *tp)
type_t *
expr_dup_type(const type_t *tp)
{
- type_t *ntp;
+ type_t *ntp;
ntp = expr_zero_alloc(sizeof(*ntp));
*ntp = *tp;
@@ -204,7 +204,7 @@ expr_unqualified_type(const type_t *tp)
bool
is_incomplete(const type_t *tp)
{
- tspec_t t;
+ tspec_t t;
if ((t = tp->t_tspec) == VOID)
return true;
@@ -259,7 +259,7 @@ dcs_add_storage_class(scl_t sc)
void
dcs_add_type(type_t *tp)
{
- tspec_t t;
+ tspec_t t;
debug_step("%s: %s", __func__, type_name(tp));
if (tp->t_typedef) {
@@ -397,7 +397,7 @@ merge_signedness(tspec_t t, tspec_t s)
static type_t *
typedef_error(type_t *td, tspec_t t)
{
- tspec_t t2;
+ tspec_t t2;
t2 = td->t_tspec;
@@ -464,7 +464,7 @@ invalid:
static void
set_first_typedef(type_t *tp, sym_t *sym)
{
- tspec_t t;
+ tspec_t t;
if (is_struct_or_union(t = tp->t_tspec)) {
if (tp->t_sou->sou_first_typedef == NULL)
@@ -572,7 +572,7 @@ dcs_add_qualifier(tqual_t q)
void
begin_declaration_level(declaration_kind dk)
{
- dinfo_t *di;
+ dinfo_t *di;
/* put a new element on the declaration stack */
di = xcalloc(1, sizeof(*di));
@@ -589,7 +589,7 @@ begin_declaration_level(declaration_kind
void
end_declaration_level(void)
{
- dinfo_t *di;
+ dinfo_t *di;
debug_step("%s(%s)", __func__, declaration_kind_name(dcs->d_kind));
@@ -726,8 +726,8 @@ dcs_adjust_storage_class(void)
static void
dcs_merge_declaration_specifiers(void)
{
- tspec_t t, s, l, c;
- type_t *tp;
+ tspec_t t, s, l, c;
+ type_t *tp;
t = dcs->d_abstract_type; /* VOID, BOOL, CHAR, INT or COMPLEX */
c = dcs->d_complex_mod; /* FLOAT or DOUBLE */
@@ -917,7 +917,7 @@ alignment_in_bits(const type_t *tp)
sym_t *
concat_lists(sym_t *l1, sym_t *l2)
{
- sym_t *l;
+ sym_t *l;
if ((l = l1) == NULL)
return l2;
@@ -939,8 +939,8 @@ concat_lists(sym_t *l1, sym_t *l2)
void
check_type(sym_t *sym)
{
- tspec_t to, t;
- type_t **tpp, *tp;
+ tspec_t to, t;
+ type_t **tpp, *tp;
tpp = &sym->s_type;
to = NO_TSPEC;
@@ -1109,9 +1109,9 @@ declare_bit_field(sym_t *dsym, tspec_t *
sym_t *
declarator_1_struct_union(sym_t *dsym)
{
- type_t *tp;
- tspec_t t;
- int sz;
+ type_t *tp;
+ tspec_t t;
+ int sz;
unsigned int o = 0; /* Appease GCC */
lint_assert(is_member(dsym));
@@ -1457,8 +1457,8 @@ add_function(sym_t *decl, sym_t *args)
static sym_t *
new_style_function(sym_t *args)
{
- sym_t *arg, *sym;
- scl_t sc;
+ sym_t *arg, *sym;
+ scl_t sc;
/*
* Declarations of structs/unions/enums in param lists are legal,
@@ -1541,7 +1541,7 @@ check_function_definition(sym_t *sym, bo
sym_t *
declarator_name(sym_t *sym)
{
- scl_t sc = NOSCL;
+ scl_t sc = NOSCL;
if (sym->s_scl == NOSCL)
dcs->d_redeclared_symbol = NULL;
@@ -1669,8 +1669,8 @@ old_style_function_name(sym_t *sym)
type_t *
make_tag_type(sym_t *tag, tspec_t kind, bool decl, bool semi)
{
- scl_t scl;
- type_t *tp;
+ scl_t scl;
+ type_t *tp;
if (kind == STRUCT)
scl = STRUCT_TAG;
@@ -2294,8 +2294,8 @@ prototypes_compatible(const type_t *tp1,
static bool
matches_no_arg_function(const type_t *tp, bool *dowarn)
{
- sym_t *arg;
- tspec_t t;
+ sym_t *arg;
+ tspec_t t;
if (tp->t_vararg && dowarn != NULL)
*dowarn = true;
@@ -2318,9 +2318,9 @@ matches_no_arg_function(const type_t *tp
static bool
check_old_style_definition(sym_t *rdsym, sym_t *dsym)
{
- sym_t *args, *pargs, *arg, *parg;
- int narg, nparg, n;
- bool dowarn, msg;
+ sym_t *args, *pargs, *arg, *parg;
+ int narg, nparg, n;
+ bool dowarn, msg;
args = rdsym->u.s_old_style_args;
pargs = dsym->s_type->t_args;
@@ -2623,8 +2623,8 @@ check_func_old_style_arguments(void)
static bool
check_prototype_declaration(sym_t *arg, sym_t *parg)
{
- type_t *tp, *ptp;
- bool dowarn;
+ type_t *tp, *ptp;
+ bool dowarn;
tp = arg->s_type;
ptp = parg->s_type;
@@ -2859,7 +2859,7 @@ declare_external_in_block(sym_t *dsym)
static bool
check_init(sym_t *sym)
{
- bool erred;
+ bool erred;
erred = false;
@@ -2891,7 +2891,7 @@ check_init(sym_t *sym)
sym_t *
abstract_name(void)
{
- sym_t *sym;
+ sym_t *sym;
lint_assert(dcs->d_kind == DK_ABSTRACT ||
dcs->d_kind == DK_PROTO_ARG);
@@ -3071,8 +3071,8 @@ check_argument_usage(bool novar, sym_t *
static void
check_variable_usage(bool novar, sym_t *sym)
{
- scl_t sc;
- sym_t *xsym;
+ scl_t sc;
+ sym_t *xsym;
lint_assert(block_level != 0);
@@ -3196,7 +3196,7 @@ check_tag_usage(sym_t *sym)
void
check_global_symbols(void)
{
- sym_t *sym;
+ sym_t *sym;
if (block_level != 0 || dcs->d_enclosing != NULL)
norecover();
@@ -3338,8 +3338,8 @@ print_previous_declaration(const sym_t *
int
to_int_constant(tnode_t *tn, bool required)
{
- int i;
- tspec_t t;
+ int i;
+ tspec_t t;
if (tn == NULL)
return 1;
Index: src/usr.bin/xlint/lint1/emit1.c
diff -u src/usr.bin/xlint/lint1/emit1.c:1.66 src/usr.bin/xlint/lint1/emit1.c:1.67
--- src/usr.bin/xlint/lint1/emit1.c:1.66 Sat Apr 22 17:49:15 2023
+++ src/usr.bin/xlint/lint1/emit1.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.66 2023/04/22 17:49:15 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.67 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: emit1.c,v 1.66 2023/04/22 17:49:15 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.67 2023/06/09 13:03:49 rillig Exp $");
#endif
#include "lint1.h"
@@ -100,9 +100,9 @@ outtype(const type_t *tp)
static const char tt[NTSPEC] = "???BCCCSSIILLQQDDDVTTTPAF?XXX";
static const char ss[NTSPEC] = "??? su u u u us l sue ?s l";
#endif
- int na;
- sym_t *arg;
- tspec_t ts;
+ int na;
+ sym_t *arg;
+ tspec_t ts;
while (tp != NULL) {
if ((ts = tp->t_tspec) == INT && tp->t_is_enum)
@@ -351,10 +351,10 @@ outfdef(const sym_t *fsym, const pos_t *
void
outcall(const tnode_t *tn, bool retval_used, bool retval_discarded)
{
- tnode_t *args, *arg;
- int narg, n, i;
- int64_t q;
- tspec_t t;
+ tnode_t *args, *arg;
+ int narg, n, i;
+ int64_t q;
+ tspec_t t;
/* reset buffer */
outclr();
@@ -489,7 +489,7 @@ static void
outfstrg(strg_t *strg)
{
char c, oc;
- bool first;
+ bool first;
const char *cp;
lint_assert(strg->st_char);
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.197 src/usr.bin/xlint/lint1/err.c:1.198
--- src/usr.bin/xlint/lint1/err.c:1.197 Sat Jun 3 21:08:06 2023
+++ src/usr.bin/xlint/lint1/err.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.197 2023/06/03 21:08:06 rillig Exp $ */
+/* $NetBSD: err.c,v 1.198 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.197 2023/06/03 21:08:06 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.198 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <limits.h>
@@ -519,7 +519,7 @@ lbasename(const char *path)
static void
verror_at(int msgid, const pos_t *pos, va_list ap)
{
- const char *fn;
+ const char *fn;
if (is_suppressed[msgid])
return;
@@ -535,7 +535,7 @@ verror_at(int msgid, const pos_t *pos, v
static void
vwarning_at(int msgid, const pos_t *pos, va_list ap)
{
- const char *fn;
+ const char *fn;
if (is_suppressed[msgid])
return;
@@ -572,7 +572,7 @@ vmessage_at(int msgid, const pos_t *pos,
void
(error_at)(int msgid, const pos_t *pos, ...)
{
- va_list ap;
+ va_list ap;
va_start(ap, pos);
verror_at(msgid, pos, ap);
@@ -582,7 +582,7 @@ void
void
(error)(int msgid, ...)
{
- va_list ap;
+ va_list ap;
va_start(ap, msgid);
verror_at(msgid, &curr_pos, ap);
@@ -592,7 +592,7 @@ void
void
assert_failed(const char *file, int line, const char *func, const char *cond)
{
- const char *fn;
+ const char *fn;
/*
* After encountering a parse error in the grammar, lint often does
@@ -620,7 +620,7 @@ assert_failed(const char *file, int line
void
(warning_at)(int msgid, const pos_t *pos, ...)
{
- va_list ap;
+ va_list ap;
va_start(ap, pos);
vwarning_at(msgid, pos, ap);
@@ -630,7 +630,7 @@ void
void
(warning)(int msgid, ...)
{
- va_list ap;
+ va_list ap;
va_start(ap, msgid);
vwarning_at(msgid, &curr_pos, ap);
@@ -650,7 +650,7 @@ void
void
(c99ism)(int msgid, ...)
{
- va_list ap;
+ va_list ap;
if (allow_c99)
return;
@@ -667,7 +667,7 @@ void
void
(c11ism)(int msgid, ...)
{
- va_list ap;
+ va_list ap;
/* FIXME: C11 mode has nothing to do with GCC mode. */
if (allow_c11 || allow_gcc)
@@ -680,7 +680,7 @@ void
bool
(gnuism)(int msgid, ...)
{
- va_list ap;
+ va_list ap;
int severity = (!allow_gcc ? 1 : 0) +
(!allow_trad && !allow_c99 ? 1 : 0);
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.154 src/usr.bin/xlint/lint1/func.c:1.155
--- src/usr.bin/xlint/lint1/func.c:1.154 Thu May 11 08:01:36 2023
+++ src/usr.bin/xlint/lint1/func.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.154 2023/05/11 08:01:36 rillig Exp $ */
+/* $NetBSD: func.c,v 1.155 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: func.c,v 1.154 2023/05/11 08:01:36 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.155 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <stdlib.h>
@@ -220,9 +220,9 @@ check_statement_reachable(void)
void
begin_function(sym_t *fsym)
{
- int n;
- bool dowarn;
- sym_t *arg, *sym, *rdsym;
+ int n;
+ bool dowarn;
+ sym_t *arg, *sym, *rdsym;
funcsym = fsym;
@@ -370,8 +370,8 @@ check_missing_return_value(void)
void
end_function(void)
{
- sym_t *arg;
- int n;
+ sym_t *arg;
+ int n;
if (reached) {
cstmt->c_had_return_noval = true;
@@ -486,9 +486,9 @@ static void
check_case_label(tnode_t *tn, control_statement *cs)
{
case_label_t *cl;
- val_t *v;
- val_t nv;
- tspec_t t;
+ val_t *v;
+ val_t nv;
+ tspec_t t;
if (cs == NULL) {
/* case not in switch */
@@ -687,8 +687,8 @@ if3(bool els)
void
switch1(tnode_t *tn)
{
- tspec_t t;
- type_t *tp;
+ tspec_t t;
+ type_t *tp;
if (tn != NULL)
tn = cconv(tn);
@@ -743,8 +743,8 @@ switch1(tnode_t *tn)
void
switch2(void)
{
- int nenum = 0, nclab = 0;
- sym_t *esym;
+ int nenum = 0, nclab = 0;
+ sym_t *esym;
case_label_t *cl;
lint_assert(cstmt->c_switch_type != NULL);
@@ -946,8 +946,8 @@ for1(tnode_t *tn1, tnode_t *tn2, tnode_t
void
for2(void)
{
- pos_t cpos, cspos;
- tnode_t *tn3;
+ pos_t cpos, cspos;
+ tnode_t *tn3;
if (cstmt->c_continue)
set_reached(true);
Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.158 src/usr.bin/xlint/lint1/lex.c:1.159
--- src/usr.bin/xlint/lint1/lex.c:1.158 Tue Apr 11 00:03:42 2023
+++ src/usr.bin/xlint/lint1/lex.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.158 2023/04/11 00:03:42 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.159 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: lex.c,v 1.158 2023/04/11 00:03:42 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.159 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <ctype.h>
@@ -405,7 +405,7 @@ initscan(void)
static int
read_byte(void)
{
- int c;
+ int c;
if ((c = lex_input()) == EOF)
return c;
@@ -847,7 +847,7 @@ get_escaped_char(int delim)
int
lex_character_constant(void)
{
- size_t n;
+ size_t n;
int val, c;
n = 0;
@@ -889,10 +889,10 @@ lex_character_constant(void)
int
lex_wide_character_constant(void)
{
- static char buf[MB_LEN_MAX + 1];
- size_t n, nmax;
+ static char buf[MB_LEN_MAX + 1];
+ size_t n, nmax;
int c;
- wchar_t wc;
+ wchar_t wc;
nmax = MB_CUR_MAX;
@@ -969,13 +969,13 @@ parse_line_directive_flags(const char *p
void
lex_directive(const char *yytext)
{
- const char *cp, *fn;
- char c, *eptr;
- size_t fnl;
- long ln;
- bool is_begin, is_end, is_system;
+ const char *cp, *fn;
+ char c, *eptr;
+ size_t fnl;
+ long ln;
+ bool is_begin, is_end, is_system;
- static bool first = true;
+ static bool first = true;
/* Go to first non-whitespace after # */
for (cp = yytext + 1; (c = *cp) == ' ' || c == '\t'; cp++)
@@ -1070,10 +1070,10 @@ lex_comment(void)
{ "SCANFLIKE", true, scanflike },
{ "VARARGS", true, varargs },
};
- char keywd[32];
- char arg[32];
- size_t l, i;
- int a;
+ char keywd[32];
+ char arg[32];
+ size_t l, i;
+ int a;
bool seen_end_of_comment = false;
@@ -1175,8 +1175,8 @@ int
lex_string(void)
{
unsigned char *s;
- int c;
- size_t len, max;
+ int c;
+ size_t len, max;
s = xmalloc(max = 64);
@@ -1204,7 +1204,7 @@ lex_string(void)
int
lex_wide_string(void)
{
- int c, n;
+ int c, n;
size_t len = 0, max = 64;
char *s = xmalloc(max);
@@ -1232,7 +1232,7 @@ lex_wide_string(void)
n = 1;
}
- wchar_t *ws = xmalloc((wlen + 1) * sizeof(*ws));
+ wchar_t *ws = xmalloc((wlen + 1) * sizeof(*ws));
size_t wi = 0;
/* convert from multibyte to wide char */
(void)mbtowc(NULL, NULL, 0);
@@ -1313,7 +1313,7 @@ getsym(sbuf_t *sb)
/* create a new symbol table entry */
/* labels must always be allocated at level 1 (outermost block) */
- dinfo_t *di;
+ dinfo_t *di;
if (symtyp == FLABEL) {
sym = level_zero_alloc(1, sizeof(*sym));
char *s = level_zero_alloc(1, sb->sb_len + 1);
@@ -1403,7 +1403,7 @@ rmsym(sym_t *sym)
void
rmsyms(sym_t *syms)
{
- sym_t *sym;
+ sym_t *sym;
/* Note the use of s_level_next instead of s_symtab_next. */
for (sym = syms; sym != NULL; sym = sym->s_level_next) {
@@ -1452,7 +1452,7 @@ clean_up_after_error(void)
sym_t *
pushdown(const sym_t *sym)
{
- sym_t *nsym;
+ sym_t *nsym;
debug_step("pushdown '%s' %s '%s'",
sym->s_name, symt_name(sym->s_kind), type_name(sym->s_type));
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.525 src/usr.bin/xlint/lint1/tree.c:1.526
--- src/usr.bin/xlint/lint1/tree.c:1.525 Sat Jun 3 20:28:54 2023
+++ src/usr.bin/xlint/lint1/tree.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.525 2023/06/03 20:28:54 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.526 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.525 2023/06/03 20:28:54 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.526 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <float.h>
@@ -315,7 +315,7 @@ ic_expr(const tnode_t *tn)
type_t *
block_derive_type(type_t *tp, tspec_t t)
{
- type_t *tp2;
+ type_t *tp2;
tp2 = block_zero_alloc(sizeof(*tp2));
tp2->t_tspec = t;
@@ -330,7 +330,7 @@ block_derive_type(type_t *tp, tspec_t t)
type_t *
expr_derive_type(type_t *tp, tspec_t t)
{
- type_t *tp2;
+ type_t *tp2;
tp2 = expr_zero_alloc(sizeof(*tp2));
tp2->t_tspec = t;
@@ -368,7 +368,7 @@ new_tnode(op_t op, bool sys, type_t *typ
tnode_t *
build_constant(type_t *tp, val_t *v)
{
- tnode_t *n;
+ tnode_t *n;
n = expr_alloc_tnode();
n->tn_op = CON;
@@ -384,7 +384,7 @@ build_constant(type_t *tp, val_t *v)
static tnode_t *
build_integer_constant(tspec_t t, int64_t q)
{
- tnode_t *n;
+ tnode_t *n;
n = expr_alloc_tnode();
n->tn_op = CON;
@@ -489,7 +489,7 @@ build_name_call(sym_t *sym)
tnode_t *
build_name(sym_t *sym, bool is_funcname)
{
- tnode_t *n;
+ tnode_t *n;
if (sym->s_scl == NOSCL && !in_gcc_attribute) {
sym->s_scl = EXTERN;
@@ -527,8 +527,8 @@ build_name(sym_t *sym, bool is_funcname)
tnode_t *
build_string(strg_t *strg)
{
- size_t len;
- tnode_t *n;
+ size_t len;
+ tnode_t *n;
type_t *tp;
len = strg->st_len;
@@ -589,7 +589,7 @@ is_out_of_char_range(const tnode_t *tn)
static void
check_integer_comparison(op_t op, tnode_t *ln, tnode_t *rn)
{
- tspec_t lt, rt;
+ tspec_t lt, rt;
lt = ln->tn_type->t_tspec;
rt = rn->tn_type->t_tspec;
@@ -753,7 +753,7 @@ balance(op_t op, tnode_t **lnp, tnode_t
static tnode_t *
build_address(bool sys, tnode_t *tn, bool noign)
{
- tspec_t t;
+ tspec_t t;
if (!noign && ((t = tn->tn_type->t_tspec) == ARRAY || t == FUNC)) {
if (!allow_c90)
@@ -932,8 +932,8 @@ fold(tnode_t *tn)
static tnode_t *
build_struct_access(op_t op, bool sys, tnode_t *ln, tnode_t *rn)
{
- tnode_t *ntn, *ctn;
- bool nolval;
+ tnode_t *ntn, *ctn;
+ bool nolval;
lint_assert(rn->tn_op == NAME);
lint_assert(is_member(rn->tn_sym));
@@ -1041,7 +1041,7 @@ subt_size_in_bytes(type_t *tp)
static tnode_t *
build_prepost_incdec(op_t op, bool sys, tnode_t *ln)
{
- tnode_t *cn, *ntn;
+ tnode_t *cn, *ntn;
lint_assert(ln != NULL);
@@ -1213,8 +1213,8 @@ merge_qualifiers(type_t *tp1, const type
static tnode_t *
build_colon(bool sys, tnode_t *ln, tnode_t *rn)
{
- tspec_t lt, rt;
- type_t *tp;
+ tspec_t lt, rt;
+ type_t *tp;
lt = ln->tn_type->t_tspec;
rt = rn->tn_type->t_tspec;
@@ -1328,8 +1328,8 @@ is_assignment(op_t op)
static tnode_t *
build_assignment(op_t op, bool sys, tnode_t *ln, tnode_t *rn)
{
- tspec_t lt, rt;
- tnode_t *ntn, *ctn;
+ tspec_t lt, rt;
+ tnode_t *ntn, *ctn;
lt = ln->tn_type->t_tspec;
rt = rn->tn_type->t_tspec;
@@ -1400,7 +1400,7 @@ build_assignment(op_t op, bool sys, tnod
static tnode_t *
build_real_imag(op_t op, bool sys, tnode_t *ln)
{
- tnode_t *cn, *ntn;
+ tnode_t *cn, *ntn;
lint_assert(ln != NULL);
@@ -1511,8 +1511,8 @@ check_precedence_confusion(tnode_t *tn)
static tnode_t *
fold_bool(tnode_t *tn)
{
- bool l, r;
- val_t *v;
+ bool l, r;
+ val_t *v;
v = xcalloc(1, sizeof(*v));
v->v_tspec = tn->tn_type->t_tspec;
@@ -1576,9 +1576,9 @@ floating_error_value(tspec_t t, ldbl_t l
static tnode_t *
fold_float(tnode_t *tn)
{
- val_t *v;
- tspec_t t;
- ldbl_t lv, rv = 0;
+ val_t *v;
+ tspec_t t;
+ ldbl_t lv, rv = 0;
fpe = 0;
v = xcalloc(1, sizeof(*v));
@@ -1670,8 +1670,8 @@ tnode_t *
build_binary(tnode_t *ln, op_t op, bool sys, tnode_t *rn)
{
const mod_t *mp;
- tnode_t *ntn;
- type_t *rettp;
+ tnode_t *ntn;
+ type_t *rettp;
mp = &modtab[op];
@@ -1896,9 +1896,9 @@ all_members_compatible(const sym_t *msym
static sym_t *
struct_or_union_member(tnode_t *tn, op_t op, sym_t *msym)
{
- struct_or_union *str;
- type_t *tp;
- tspec_t t;
+ struct_or_union *str;
+ type_t *tp;
+ tspec_t t;
/*
* Remove the member if it was unknown until now, which means
@@ -2003,7 +2003,7 @@ struct_or_union_member(tnode_t *tn, op_t
tnode_t *
build_member_access(tnode_t *ln, op_t op, bool sys, sbuf_t *member)
{
- sym_t *msym;
+ sym_t *msym;
if (ln == NULL)
return NULL;
@@ -2869,8 +2869,8 @@ static bool
check_assign_types_compatible(op_t op, int arg,
const tnode_t *ln, const tnode_t *rn)
{
- tspec_t lt, rt, lst = NO_TSPEC, rst = NO_TSPEC;
- type_t *ltp, *rtp, *lstp = NULL, *rstp = NULL;
+ tspec_t lt, rt, lst = NO_TSPEC, rst = NO_TSPEC;
+ type_t *ltp, *rtp, *lstp = NULL, *rstp = NULL;
if ((lt = (ltp = ln->tn_type)->t_tspec) == PTR)
lst = (lstp = ltp->t_subt)->t_tspec;
@@ -3188,8 +3188,8 @@ typeok_enum(op_t op, const mod_t *mp, in
bool
typeok(op_t op, int arg, const tnode_t *ln, const tnode_t *rn)
{
- tspec_t lt, rt;
- type_t *ltp, *rtp;
+ tspec_t lt, rt;
+ type_t *ltp, *rtp;
const mod_t *mp = &modtab[op];
@@ -4138,7 +4138,7 @@ cast_to_union(tnode_t *otn, type_t *ntp)
tnode_t *
cast(tnode_t *tn, type_t *tp)
{
- tspec_t nt, ot;
+ tspec_t nt, ot;
if (tn == NULL)
return NULL;
@@ -4231,7 +4231,7 @@ check_prototype_argument(
type_t *tp, /* expected type (from prototype) */
tnode_t *tn) /* argument */
{
- tnode_t *ln = xcalloc(1, sizeof(*ln));
+ tnode_t *ln = xcalloc(1, sizeof(*ln));
ln->tn_type = expr_unqualified_type(tp);
ln->tn_lvalue = true;
if (typeok(FARG, n, ln, tn)) {
@@ -4251,10 +4251,10 @@ check_prototype_argument(
static tnode_t *
check_function_arguments(type_t *ftp, tnode_t *args)
{
- tnode_t *arg;
- sym_t *asym;
- tspec_t at;
- int narg, npar, n, i;
+ tnode_t *arg;
+ sym_t *asym;
+ tspec_t at;
+ int narg, npar, n, i;
/* get # of args in the prototype */
npar = 0;
@@ -4324,8 +4324,8 @@ check_function_arguments(type_t *ftp, tn
tnode_t *
build_function_call(tnode_t *func, bool sys, tnode_t *args)
{
- tnode_t *ntn;
- op_t fcop;
+ tnode_t *ntn;
+ op_t fcop;
if (func == NULL)
return NULL;
@@ -4740,7 +4740,7 @@ constant_addr(const tnode_t *tn, const s
{
const sym_t *sym;
ptrdiff_t offs1, offs2;
- tspec_t t, ot;
+ tspec_t t, ot;
switch (tn->tn_op) {
case MINUS:
Index: src/usr.bin/xlint/lint2/chk.c
diff -u src/usr.bin/xlint/lint2/chk.c:1.54 src/usr.bin/xlint/lint2/chk.c:1.55
--- src/usr.bin/xlint/lint2/chk.c:1.54 Mon May 22 12:55:04 2023
+++ src/usr.bin/xlint/lint2/chk.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: chk.c,v 1.54 2023/05/22 12:55:04 rillig Exp $ */
+/* $NetBSD: chk.c,v 1.55 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: chk.c,v 1.54 2023/05/22 12:55:04 rillig Exp $");
+__RCSID("$NetBSD: chk.c,v 1.55 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <ctype.h>
@@ -76,7 +76,7 @@ static bool matches_no_arg_function(type
void
mark_main_as_used(void)
{
- hte_t *hte;
+ hte_t *hte;
if ((hte = hsearch("main", false)) != NULL)
hte->h_used = true;
@@ -88,7 +88,7 @@ mark_main_as_used(void)
void
check_name(const hte_t *hte)
{
- sym_t *sym, *def, *pdecl, *decl;
+ sym_t *sym, *def, *pdecl, *decl;
if (uflag) {
check_used_not_defined(hte);
@@ -133,8 +133,8 @@ check_name(const hte_t *hte)
static void
check_used_not_defined(const hte_t *hte)
{
- fcall_t *fcall;
- usym_t *usym;
+ fcall_t *fcall;
+ usym_t *usym;
if (!hte->h_used || hte->h_def)
return;
@@ -154,7 +154,7 @@ check_used_not_defined(const hte_t *hte)
static void
check_defined_not_used(const hte_t *hte)
{
- sym_t *sym;
+ sym_t *sym;
if (!hte->h_def || hte->h_used)
return;
@@ -175,7 +175,7 @@ check_defined_not_used(const hte_t *hte)
static void
check_declared_not_used_or_defined(const hte_t *hte)
{
- sym_t *sym;
+ sym_t *sym;
if (hte->h_syms == NULL || hte->h_used || hte->h_def)
return;
@@ -197,8 +197,8 @@ check_declared_not_used_or_defined(const
static void
check_multiple_definitions(const hte_t *hte)
{
- sym_t *sym, *def1;
- char *pos1;
+ sym_t *sym, *def1;
+ char *pos1;
if (!hte->h_def)
return;
@@ -236,11 +236,11 @@ check_multiple_definitions(const hte_t *
static void
chkvtui(const hte_t *hte, sym_t *def, sym_t *decl)
{
- fcall_t *call;
- char *pos1;
- type_t *tp1, *tp2;
- bool dowarn, eq;
- tspec_t t1;
+ fcall_t *call;
+ char *pos1;
+ type_t *tp1, *tp2;
+ bool dowarn, eq;
+ tspec_t t1;
if (hte->h_calls == NULL)
return;
@@ -298,10 +298,10 @@ chkvtui(const hte_t *hte, sym_t *def, sy
static void
chkvtdi(const hte_t *hte, sym_t *def, sym_t *decl)
{
- sym_t *sym;
- type_t *tp1, *tp2;
- bool eq, dowarn;
- char *pos1;
+ sym_t *sym;
+ type_t *tp1, *tp2;
+ bool eq, dowarn;
+ char *pos1;
if (def == NULL)
def = decl;
@@ -340,11 +340,11 @@ chkvtdi(const hte_t *hte, sym_t *def, sy
static void
chkfaui(const hte_t *hte, sym_t *def, sym_t *decl)
{
- type_t *tp1, *tp2, **ap1, **ap2;
- pos_t *pos1p = NULL;
- fcall_t *calls, *call, *call1;
- int n, as;
- char *pos1;
+ type_t *tp1, *tp2, **ap1, **ap2;
+ pos_t *pos1p = NULL;
+ fcall_t *calls, *call, *call1;
+ int n, as;
+ char *pos1;
arginf_t *ai;
if ((calls = hte->h_calls) == NULL)
@@ -453,10 +453,10 @@ static void
chkau(const hte_t *hte, int n, sym_t *def, sym_t *decl, pos_t *pos1p,
fcall_t *call1, fcall_t *call, type_t *arg1, type_t *arg2)
{
- bool promote, asgn, dowarn;
- tspec_t t1, t2;
+ bool promote, asgn, dowarn;
+ tspec_t t1, t2;
arginf_t *ai, *ai1;
- char *pos1;
+ char *pos1;
/*
* If a function definition is available (def != NULL), we compare the
@@ -607,11 +607,11 @@ chkau(const hte_t *hte, int n, sym_t *de
static void
printflike(const hte_t *hte, fcall_t *call, int n, const char *fmt, type_t **ap)
{
- const char *fp;
- char fc;
- bool fwidth, prec, left, sign, space, alt, zero;
- tspec_t sz, t1, t2 = NO_TSPEC;
- type_t *tp;
+ const char *fp;
+ char fc;
+ bool fwidth, prec, left, sign, space, alt, zero;
+ tspec_t sz, t1, t2 = NO_TSPEC;
+ type_t *tp;
fp = fmt;
fc = *fp++;
@@ -832,11 +832,11 @@ printflike(const hte_t *hte, fcall_t *ca
static void
scanflike(const hte_t *hte, fcall_t *call, int n, const char *fmt, type_t **ap)
{
- const char *fp;
- char fc;
- bool noasgn, fwidth;
- tspec_t sz, t1 = NO_TSPEC, t2 = NO_TSPEC;
- type_t *tp = NULL;
+ const char *fp;
+ char fc;
+ bool noasgn, fwidth;
+ tspec_t sz, t1 = NO_TSPEC, t2 = NO_TSPEC;
+ type_t *tp = NULL;
fp = fmt;
fc = *fp++;
@@ -1073,8 +1073,8 @@ static const char ignorelist[][8] = {
static void
check_return_values(const hte_t *hte, sym_t *def)
{
- fcall_t *call;
- bool used, ignored;
+ fcall_t *call;
+ bool used, ignored;
if (def == NULL)
/* don't know whether or not the functions returns a value */
@@ -1127,12 +1127,12 @@ check_return_values(const hte_t *hte, sy
static void
check_argument_declarations(const hte_t *hte, sym_t *def, sym_t *decl)
{
- bool osdef, eq, dowarn;
- int n;
- sym_t *sym1, *sym;
- type_t **ap1, **ap2, *tp1, *tp2;
- char *pos1;
- const char *pos2;
+ bool osdef, eq, dowarn;
+ int n;
+ sym_t *sym1, *sym;
+ type_t **ap1, **ap2, *tp1, *tp2;
+ char *pos1;
+ const char *pos2;
osdef = false;
if (def != NULL) {
@@ -1210,8 +1210,8 @@ static bool
types_compatible(type_t *tp1, type_t *tp2,
bool ignqual, bool promot, bool asgn, bool *dowarn)
{
- tspec_t t, to;
- int indir;
+ tspec_t t, to;
+ int indir;
to = NO_TSPEC;
indir = 0;
@@ -1336,7 +1336,7 @@ types_compatible(type_t *tp1, type_t *tp
static bool
prototypes_compatible(type_t *tp1, type_t *tp2, bool *dowarn)
{
- type_t **a1, **a2;
+ type_t **a1, **a2;
if (tp1->t_vararg != tp2->t_vararg)
return false;
@@ -1370,8 +1370,8 @@ prototypes_compatible(type_t *tp1, type_
static bool
matches_no_arg_function(type_t *tp, bool *dowarn)
{
- type_t **arg;
- tspec_t t;
+ type_t **arg;
+ tspec_t t;
if (tp->t_vararg && dowarn != NULL)
*dowarn = true;
Index: src/usr.bin/xlint/lint2/emit2.c
diff -u src/usr.bin/xlint/lint2/emit2.c:1.30 src/usr.bin/xlint/lint2/emit2.c:1.31
--- src/usr.bin/xlint/lint2/emit2.c:1.30 Thu Feb 2 22:23:30 2023
+++ src/usr.bin/xlint/lint2/emit2.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: emit2.c,v 1.30 2023/02/02 22:23:30 rillig Exp $ */
+/* $NetBSD: emit2.c,v 1.31 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: emit2.c,v 1.30 2023/02/02 22:23:30 rillig Exp $");
+__RCSID("$NetBSD: emit2.c,v 1.31 2023/06/09 13:03:49 rillig Exp $");
#endif
#include "lint2.h"
@@ -59,7 +59,7 @@ outtype(type_t *tp)
#endif
while (tp != NULL) {
- tspec_t ts = tp->t_tspec;
+ tspec_t ts = tp->t_tspec;
if (ts == INT && tp->t_is_enum)
ts = ENUM;
if (!ch_isupper(tt[ts]))
@@ -166,7 +166,7 @@ outdef(hte_t *hte, sym_t *sym)
static void
dumpname(hte_t *hte)
{
- sym_t *sym, *def;
+ sym_t *sym, *def;
/* static and undefined symbols are not written */
if (hte->h_static || !hte->h_def)
Index: src/usr.bin/xlint/lint2/hash.c
diff -u src/usr.bin/xlint/lint2/hash.c:1.24 src/usr.bin/xlint/lint2/hash.c:1.25
--- src/usr.bin/xlint/lint2/hash.c:1.24 Fri May 20 21:18:55 2022
+++ src/usr.bin/xlint/lint2/hash.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.24 2022/05/20 21:18:55 rillig Exp $ */
+/* $NetBSD: hash.c,v 1.25 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: hash.c,v 1.24 2022/05/20 21:18:55 rillig Exp $");
+__RCSID("$NetBSD: hash.c,v 1.25 2023/06/09 13:03:49 rillig Exp $");
#endif
/*
@@ -88,7 +88,7 @@ hte_t *
_hsearch(hte_t **table, const char *s, bool mknew)
{
unsigned int h;
- hte_t *hte;
+ hte_t *hte;
if (table == NULL)
table = htab;
@@ -159,9 +159,9 @@ symtab_init(void)
void
symtab_forall(void (*action)(hte_t *))
{
- int i;
- hte_t *hte;
- hte_t **table = htab;
+ int i;
+ hte_t *hte;
+ hte_t **table = htab;
for (i = 0; i < HSHSIZ2; i++) {
for (hte = table[i]; hte != NULL; hte = hte->h_link)
@@ -196,8 +196,8 @@ symtab_forall_sorted(void (*action)(hte_
void
_destroyhash(hte_t **table)
{
- int i;
- hte_t *hte, *nexthte;
+ int i;
+ hte_t *hte, *nexthte;
if (table == NULL)
err(1, "_destroyhash called on main hash table");
Index: src/usr.bin/xlint/lint2/main2.c
diff -u src/usr.bin/xlint/lint2/main2.c:1.28 src/usr.bin/xlint/lint2/main2.c:1.29
--- src/usr.bin/xlint/lint2/main2.c:1.28 Tue Mar 28 14:44:35 2023
+++ src/usr.bin/xlint/lint2/main2.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main2.c,v 1.28 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: main2.c,v 1.29 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: main2.c,v 1.28 2023/03/28 14:44:35 rillig Exp $");
+__RCSID("$NetBSD: main2.c,v 1.29 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <stdio.h>
@@ -97,9 +97,9 @@ check_name_non_const(hte_t *hte)
int
main(int argc, char *argv[])
{
- int c, i;
- size_t len;
- char *lname;
+ int c, i;
+ size_t len;
+ char *lname;
libs = xcalloc(1, sizeof(*libs));
Index: src/usr.bin/xlint/lint2/msg.c
diff -u src/usr.bin/xlint/lint2/msg.c:1.19 src/usr.bin/xlint/lint2/msg.c:1.20
--- src/usr.bin/xlint/lint2/msg.c:1.19 Sun Feb 19 19:27:01 2023
+++ src/usr.bin/xlint/lint2/msg.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.c,v 1.19 2023/02/19 19:27:01 rillig Exp $ */
+/* $NetBSD: msg.c,v 1.20 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: msg.c,v 1.19 2023/02/19 19:27:01 rillig Exp $");
+__RCSID("$NetBSD: msg.c,v 1.20 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <stdarg.h>
@@ -71,7 +71,7 @@ static const char *msgs[] = {
void
msg(int n, ...)
{
- va_list ap;
+ va_list ap;
va_start(ap, n);
@@ -104,12 +104,12 @@ lbasename(const char *path)
const char *
mkpos(pos_t *posp)
{
- size_t len;
- const char *fn;
- static char *buf;
- static size_t blen = 0;
- bool qm;
- int src, line;
+ size_t len;
+ const char *fn;
+ static char *buf;
+ static size_t blen = 0;
+ bool qm;
+ int src, line;
if (Hflag && posp->p_src != posp->p_isrc) {
src = posp->p_isrc;
Index: src/usr.bin/xlint/lint2/read.c
diff -u src/usr.bin/xlint/lint2/read.c:1.80 src/usr.bin/xlint/lint2/read.c:1.81
--- src/usr.bin/xlint/lint2/read.c:1.80 Mon May 22 12:55:04 2023
+++ src/usr.bin/xlint/lint2/read.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.80 2023/05/22 12:55:04 rillig Exp $ */
+/* $NetBSD: read.c,v 1.81 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: read.c,v 1.80 2023/05/22 12:55:04 rillig Exp $");
+__RCSID("$NetBSD: read.c,v 1.81 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <ctype.h>
@@ -214,9 +214,9 @@ read_ln_line(const char *line)
void
readfile(const char *name)
{
- FILE *inp;
- size_t len;
- char *line;
+ FILE *inp;
+ size_t len;
+ char *line;
if (inpfns == NULL)
inpfns = xcalloc(ninpfns = 128, sizeof(*inpfns));
@@ -316,10 +316,10 @@ static void
funccall(pos_t pos, const char *cp)
{
arginf_t *ai, **lai;
- char c;
- bool rused, rdisc;
- hte_t *hte;
- fcall_t *fcall;
+ char c;
+ bool rused, rdisc;
+ hte_t *hte;
+ fcall_t *fcall;
const char *name;
fcall = xalloc(sizeof(*fcall));
@@ -468,10 +468,10 @@ parse_function_attribute(const char **pp
static void
decldef(pos_t pos, const char *cp)
{
- sym_t *symp, sym;
- char *pos1, *tname;
- bool used, renamed;
- hte_t *hte, *renamehte = NULL;
+ sym_t *symp, sym;
+ char *pos1, *tname;
+ bool used, renamed;
+ hte_t *hte, *renamehte = NULL;
const char *name, *newname;
(void)memset(&sym, 0, sizeof(sym));
@@ -564,8 +564,8 @@ decldef(pos_t pos, const char *cp)
static void
usedsym(pos_t pos, const char *cp)
{
- usym_t *usym;
- hte_t *hte;
+ usym_t *usym;
+ hte_t *hte;
const char *name;
usym = xalloc(sizeof(*usym));
@@ -651,14 +651,14 @@ parse_tspec(const char **pp, char c, boo
static unsigned short
inptype(const char *cp, const char **epp)
{
- char c;
- const char *ep;
- type_t *tp;
- int narg, i;
- bool osdef = false;
- size_t tlen;
+ char c;
+ const char *ep;
+ type_t *tp;
+ int narg, i;
+ bool osdef = false;
+ size_t tlen;
unsigned short tidx;
- int h;
+ int h;
/* If we have this type already, return its index. */
tlen = gettlen(cp, &ep);
@@ -753,10 +753,10 @@ inptype(const char *cp, const char **epp
static size_t
gettlen(const char *cp, const char **epp)
{
- const char *cp1;
- char c, s;
- tspec_t t;
- int narg, i;
+ const char *cp1;
+ char c, s;
+ tspec_t t;
+ int narg, i;
cp1 = cp;
@@ -932,7 +932,7 @@ gettlen(const char *cp, const char **epp
static unsigned short
findtype(const char *cp, size_t len, int h)
{
- thtab_t *thte;
+ thtab_t *thte;
for (thte = thtab[h]; thte != NULL; thte = thte->th_next) {
if (strncmp(thte->th_name, cp, len) != 0)
@@ -952,8 +952,8 @@ static unsigned short
storetyp(type_t *tp, const char *cp, size_t len, int h)
{
static unsigned int tidx = 1; /* 0 is reserved */
- thtab_t *thte;
- char *name;
+ thtab_t *thte;
+ char *name;
if (tidx >= USHRT_MAX)
errx(1, "sorry, too many types");
@@ -1002,10 +1002,10 @@ thash(const char *s, size_t len)
static char *
inpqstrg(const char *src, const char **epp)
{
- char *strg, *dst;
- size_t slen;
- char c;
- int v;
+ char *strg, *dst;
+ size_t slen;
+ char c;
+ int v;
dst = strg = xmalloc(slen = 32);
@@ -1085,10 +1085,10 @@ inpqstrg(const char *src, const char **e
static const char *
inpname(const char *cp, const char **epp)
{
- static char *buf;
- static size_t blen = 0;
- size_t len, i;
- char c;
+ static char *buf;
+ static size_t blen = 0;
+ size_t len, i;
+ char c;
len = parse_int(&cp);
if (len + 1 > blen)
@@ -1112,7 +1112,7 @@ inpname(const char *cp, const char **epp
static int
getfnidx(const char *fn)
{
- size_t i;
+ size_t i;
/* 0 is reserved */
for (i = 1; fnames[i] != NULL; i++) {
@@ -1140,11 +1140,11 @@ getfnidx(const char *fn)
void
mkstatic(hte_t *hte)
{
- sym_t *sym1, **symp, *sym;
- fcall_t **callp, *call;
- usym_t **usymp, *usym;
- hte_t *nhte;
- bool ofnd;
+ sym_t *sym1, **symp, *sym;
+ fcall_t **callp, *call;
+ usym_t **usymp, *usym;
+ hte_t *nhte;
+ bool ofnd;
/* Look for first static definition */
for (sym1 = hte->h_syms; sym1 != NULL; sym1 = sym1->s_next) {
Index: src/usr.bin/xlint/xlint/xlint.c
diff -u src/usr.bin/xlint/xlint/xlint.c:1.109 src/usr.bin/xlint/xlint/xlint.c:1.110
--- src/usr.bin/xlint/xlint/xlint.c:1.109 Sun Feb 19 19:27:02 2023
+++ src/usr.bin/xlint/xlint/xlint.c Fri Jun 9 13:03:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.109 2023/02/19 19:27:02 rillig Exp $ */
+/* $NetBSD: xlint.c,v 1.110 2023/06/09 13:03:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: xlint.c,v 1.109 2023/02/19 19:27:02 rillig Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.110 2023/06/09 13:03:49 rillig Exp $");
#endif
#include <sys/param.h>
@@ -629,10 +629,10 @@ main(int argc, char *argv[])
static void
handle_filename(const char *name)
{
- const char *bn, *suff;
- char *ofn;
- size_t len;
- int fd;
+ const char *bn, *suff;
+ char *ofn;
+ size_t len;
+ int fd;
bn = lbasename(name, '/');
suff = lbasename(bn, '.');
@@ -716,7 +716,7 @@ needs_quoting:
static void
run_child(const char *path, list *args, const char *crfn, int fdout)
{
- int status, rv, signo;
+ int status, rv, signo;
if (Vflag) {
print_sh_quoted(args->items[0]);
@@ -809,7 +809,7 @@ find_libs(const list *l)
static bool
file_is_readable(const char *path)
{
- struct stat sbuf;
+ struct stat sbuf;
if (stat(path, &sbuf) == -1)
return false;
@@ -823,9 +823,9 @@ file_is_readable(const char *path)
static void
cat(const list *srcs, const char *dest)
{
- int ifd, ofd;
- ssize_t rlen;
- char buf[0x4000];
+ int ifd, ofd;
+ ssize_t rlen;
+ char buf[0x4000];
if ((ofd = open(dest, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
warn("cannot open %s", dest);
