Skip to content

Commit 93b2532

Browse files
joejoe
joe
authored and
joe
committed
clear: trailing whitespaces
1 parent 58d1156 commit 93b2532

File tree

9 files changed

+42
-43
lines changed

9 files changed

+42
-43
lines changed

‎usr.bin/config/hash.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: hash.c,v 1.11 2014/10/29 17:14:50 christos Exp $ */
1+
/* $NetBSD: hash.c,v 1.12 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
#include <sys/cdefs.h>
48-
__RCSID("$NetBSD: hash.c,v 1.11 2014/10/29 17:14:50 christos Exp $");
48+
__RCSID("$NetBSD: hash.c,v 1.12 2025/01/07 14:21:11 joe Exp $");
4949

5050
#include <sys/param.h>
5151
#include <assert.h>
@@ -357,7 +357,7 @@ ht_enumerate2(struct hashtab *ht, ht_callback2 cbfunc2, void *arg)
357357
struct hashenthead *hpp;
358358
size_t i;
359359
int rval = 0;
360-
360+
361361
for (i = 0; i < ht->ht_size; i++) {
362362
hpp = &ht->ht_tab[i];
363363
TAILQ_FOREACH(hp, hpp, h_next)
@@ -373,7 +373,7 @@ ht_enumerate(struct hashtab *ht, ht_callback cbfunc, void *arg)
373373
struct hashenthead *hpp;
374374
size_t i;
375375
int rval = 0;
376-
376+
377377
for (i = 0; i < ht->ht_size; i++) {
378378
hpp = &ht->ht_tab[i];
379379
TAILQ_FOREACH(hp, hpp, h_next)

‎usr.bin/config/lint.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: lint.c,v 1.16 2021/10/12 17:14:10 christos Exp $ */
1+
/* $NetBSD: lint.c,v 1.17 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 2007 The NetBSD Foundation.
@@ -31,7 +31,7 @@
3131
#endif
3232

3333
#include <sys/cdefs.h>
34-
__RCSID("$NetBSD: lint.c,v 1.16 2021/10/12 17:14:10 christos Exp $");
34+
__RCSID("$NetBSD: lint.c,v 1.17 2025/01/07 14:21:11 joe Exp $");
3535

3636
#include <assert.h>
3737
#include <stdlib.h>
@@ -110,7 +110,6 @@ do_emit_fs(const char *name, struct nvlist *nv, void *v)
110110

111111
return 1;
112112
}
113-
114113

115114
void
116115
emit_options(void)

‎usr.bin/config/main.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: main.c,v 1.101 2024/01/18 04:41:37 thorpej Exp $ */
1+
/* $NetBSD: main.c,v 1.102 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
#include <sys/cdefs.h>
48-
__RCSID("$NetBSD: main.c,v 1.101 2024/01/18 04:41:37 thorpej Exp $");
48+
__RCSID("$NetBSD: main.c,v 1.102 2025/01/07 14:21:11 joe Exp $");
4949

5050
#ifndef MAKE_BOOTSTRAP
5151
#include <sys/cdefs.h>
@@ -884,7 +884,7 @@ deffilesystem(struct nvlist *fses, struct nvlist *deps)
884884
/*
885885
* Implicit attribute definition for filesystem.
886886
*/
887-
const char *n;
887+
const char *n;
888888
n = strtolower(nv->nv_name);
889889
refattr(n);
890890
}
@@ -1099,7 +1099,7 @@ defoption(const char *fname, struct defoptlist *opts, struct nvlist *deps)
10991099

11001100

11011101
/*
1102-
* Define an option for which a value is required.
1102+
* Define an option for which a value is required.
11031103
*/
11041104
void
11051105
defparam(const char *fname, struct defoptlist *opts, struct nvlist *deps, int obs)
@@ -1206,7 +1206,7 @@ deloption(const char *name, int nowarn)
12061206
void
12071207
addfsoption(const char *name)
12081208
{
1209-
const char *n;
1209+
const char *n;
12101210

12111211
/* Make sure this is a defined file system. */
12121212
if (!OPT_FSOPT(name)) {
@@ -1376,7 +1376,7 @@ undo_option(struct hashtab *ht, struct nvlist **npp,
13761376
struct nvlist ***next, const char *name, const char *type, int nowarn)
13771377
{
13781378
struct nvlist *nv;
1379-
1379+
13801380
if (ht_remove(ht, name)) {
13811381
/*
13821382
* -U command line option removals are always silent
@@ -1610,7 +1610,7 @@ mkident(void)
16101610

16111611
if (ident == NULL)
16121612
return (0);
1613-
1613+
16141614
if ((fp = fopen("ident", "w")) == NULL) {
16151615
warn("cannot write ident");
16161616
return (1);
@@ -1870,7 +1870,7 @@ extract_config(const char *kname, const char *cname, int cfd)
18701870

18711871
(void)close(kfd);
18721872
(void)munmap(base, (size_t)st.st_size);
1873-
1873+
18741874
return found;
18751875
}
18761876

@@ -1930,7 +1930,7 @@ devbase_has_any_instance(struct devbase *dev, int unit, int state, int level)
19301930
return ht_enumerate(deaddevitab, devbase_has_dead_instances,
19311931
&dhdi);
19321932
}
1933-
1933+
19341934
return 0;
19351935
}
19361936

@@ -1997,7 +1997,7 @@ addlevelparent(struct devbase *d, struct devbase *parent)
19971997
for (p = parent; p != NULL; p = p->d_levelparent)
19981998
if (d == p && d->d_level > 1)
19991999
return 0;
2000-
d->d_levelparent = p ? p : &root;
2000+
d->d_levelparent = p ? p : &root;
20012001
d->d_level++;
20022002
return 1;
20032003
}
@@ -2109,7 +2109,7 @@ do_kill_orphans(struct devbase *d, struct attr *at, struct devbase *parent,
21092109

21102110
} else if (!changed)
21112111
goto out;
2112-
}
2112+
}
21132113
}
21142114

21152115
for (al = d->d_attrs; al != NULL; al = al->al_next) {

‎usr.bin/config/mkdevsw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mkdevsw.c,v 1.15 2016/07/16 07:13:26 pgoyette Exp $ */
1+
/* $NetBSD: mkdevsw.c,v 1.16 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
3434
#endif
3535

3636
#include <sys/cdefs.h>
37-
__RCSID("$NetBSD: mkdevsw.c,v 1.15 2016/07/16 07:13:26 pgoyette Exp $");
37+
__RCSID("$NetBSD: mkdevsw.c,v 1.16 2025/01/07 14:21:11 joe Exp $");
3838

3939
#include <stdio.h>
4040
#include <string.h>
@@ -113,7 +113,7 @@ pentry(FILE *fp, struct hashtab *t, devmajor_t i, char p)
113113
dm = ht_lookup(t, intern(mstr));
114114

115115
if (dm)
116-
fprintf(fp, "\t&%s_%cdevsw", dm->dm_name, p);
116+
fprintf(fp, "\t&%s_%cdevsw", dm->dm_name, p);
117117
else
118118
fputs("\tNULL", fp);
119119

‎usr.bin/config/mkheaders.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mkheaders.c,v 1.29 2015/09/03 13:53:36 uebayasi Exp $ */
1+
/* $NetBSD: mkheaders.c,v 1.30 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
#include <sys/cdefs.h>
48-
__RCSID("$NetBSD: mkheaders.c,v 1.29 2015/09/03 13:53:36 uebayasi Exp $");
48+
__RCSID("$NetBSD: mkheaders.c,v 1.30 2025/01/07 14:21:11 joe Exp $");
4949

5050
#include <sys/param.h>
5151
#include <ctype.h>
@@ -208,7 +208,7 @@ fprintstr(FILE *fp, const char *str)
208208
}
209209

210210
(void)fputc('\t', fp);
211-
211+
212212
for (; *str; str++) {
213213
switch (*str) {
214214
case '\\':
@@ -362,7 +362,7 @@ emitlocs(void)
362362
const char *tfname;
363363
int rval;
364364
FILE *tfp;
365-
365+
366366
tfname = "tmp_locators.h";
367367
if ((tfp = fopen(tfname, "w")) == NULL)
368368
return (herr("open", tfname, NULL));
@@ -444,9 +444,9 @@ emittime(void)
444444
"#define CONFIG_MONTH\t%2d\n"
445445
"#define CONFIG_DATE\t%2d\n"
446446
"#define CONFIG_HOUR\t%2d\n"
447-
"#define CONFIG_MINS\t%2d\n"
447+
"#define CONFIG_MINS\t%2d\n"
448448
"#define CONFIG_SECS\t%2d\n",
449-
buf, (long long)t,
449+
buf, (long long)t,
450450
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
451451
tm->tm_hour, tm->tm_min, tm->tm_sec);
452452

‎usr.bin/config/pack.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: pack.c,v 1.11 2024/04/05 00:43:42 riastradh Exp $ */
1+
/* $NetBSD: pack.c,v 1.12 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
#include <sys/cdefs.h>
48-
__RCSID("$NetBSD: pack.c,v 1.11 2024/04/05 00:43:42 riastradh Exp $");
48+
__RCSID("$NetBSD: pack.c,v 1.12 2025/01/07 14:21:11 joe Exp $");
4949

5050
#include <sys/param.h>
5151
#include <stdlib.h>
@@ -248,7 +248,7 @@ packlocs(void)
248248
if ((ps = i->i_pspec) != NULL &&
249249
(l = ps->p_iattr->a_loclen) > 0) {
250250
if (Pflag) {
251-
o = findvec(i->i_locs,
251+
o = findvec(i->i_locs,
252252
LOCHASH(i->i_locs[l - 1]), l,
253253
samelocs, locators.used);
254254
i->i_locoff = o < 0 ?

‎usr.bin/config/scan.l

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%{
2-
/* $NetBSD: scan.l,v 1.36 2024/08/13 10:14:04 uwe Exp $ */
2+
/* $NetBSD: scan.l,v 1.37 2025/01/07 14:21:11 joe Exp $ */
33

44
/*
55
* Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
4242
*/
4343

4444
#include <sys/cdefs.h>
45-
__RCSID("$NetBSD: scan.l,v 1.36 2024/08/13 10:14:04 uwe Exp $");
45+
__RCSID("$NetBSD: scan.l,v 1.37 2025/01/07 14:21:11 joe Exp $");
4646

4747
#include <sys/param.h>
4848
#include <errno.h>
@@ -124,7 +124,7 @@ SLIST_HEAD(, prefix) curdirs; /* curdir stack */
124124
%option noyywrap nounput noinput
125125

126126
PATH [A-Za-z_0-9]*[./][-A-Za-z_0-9./]*
127-
QCHARS \"(\\.|[^\\"])*\"
127+
QCHARS \"(\\.|[^\\"])*\"
128128
WORD [A-Za-z_][-A-Za-z_0-9]*
129129
FILENAME ({PATH}|{QCHARS})
130130
RESTOFLINE [ \t]*(#[^\n]*)?\n

‎usr.bin/config/sem.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: sem.c,v 1.86 2021/08/25 23:07:34 rillig Exp $ */
1+
/* $NetBSD: sem.c,v 1.87 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
#include <sys/cdefs.h>
48-
__RCSID("$NetBSD: sem.c,v 1.86 2021/08/25 23:07:34 rillig Exp $");
48+
__RCSID("$NetBSD: sem.c,v 1.87 2025/01/07 14:21:11 joe Exp $");
4949

5050
#include <sys/param.h>
5151
#include <ctype.h>
@@ -1211,7 +1211,7 @@ finddevattr(const char *name, const char *at, struct devbase *ib,
12111211
*
12121212
* (1) If we're attached to an attribute, then we don't need
12131213
* look at the parent base device to see what attributes
1214-
* it has, and make sure that we can attach to them.
1214+
* it has, and make sure that we can attach to them.
12151215
*
12161216
* (2) If we're attached to a real device (i.e. named in
12171217
* the config file), we want to remember that so that
@@ -1575,7 +1575,7 @@ deldeva(const char *at, int nowarn)
15751575
CFGDBG(5, "deselecting deva `%s'", at);
15761576
if (at[0] == '\0')
15771577
goto out;
1578-
1578+
15791579
l = strlen(at) - 1;
15801580
if (at[l] == '?' || isdigit((unsigned char)at[l])) {
15811581
char base[NAMESIZE];
@@ -1740,7 +1740,7 @@ addpseudoroot(const char *name)
17401740
* and, it works, since the pseudoroot device is not included
17411741
* in ioconf, just used by config to make sure we start from
17421742
* the right place.
1743-
*/
1743+
*/
17441744
snprintf(fakename, sizeof(fakename), "%s_devattrs", buf);
17451745
fakedev = getdevbase(intern(fakename));
17461746
fakedev->d_isdef = 1;
@@ -1946,7 +1946,7 @@ getpspec(struct attr *attr, struct devbase *ab, int atunit, int first)
19461946
inst = p->p_inst;
19471947
ref = p->p_ref;
19481948
}
1949-
1949+
19501950
}
19511951
}
19521952

@@ -2186,7 +2186,7 @@ selectbase(struct devbase *d, struct deva *da)
21862186
struct attr *devattr;
21872187
devattr = refattr(d->d_name);
21882188
expandattr(devattr, selectattr);
2189-
2189+
21902190
if (da != NULL) {
21912191
(void)ht_insert(selecttab, da->d_name, __UNCONST(da->d_name));
21922192
CFGDBG(3, "devattr selected `%s'", da->d_name);

‎usr.bin/config/util.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: util.c,v 1.22 2024/01/18 04:41:38 thorpej Exp $ */
1+
/* $NetBSD: util.c,v 1.23 2025/01/07 14:21:11 joe Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
#include <sys/cdefs.h>
48-
__RCSID("$NetBSD: util.c,v 1.22 2024/01/18 04:41:38 thorpej Exp $");
48+
__RCSID("$NetBSD: util.c,v 1.23 2025/01/07 14:21:11 joe Exp $");
4949

5050
#include <sys/types.h>
5151
#include <assert.h>
@@ -409,7 +409,7 @@ condexpr_create(enum condexpr_types type)
409409
cx->cx_or.left = NULL;
410410
cx->cx_or.right = NULL;
411411
break;
412-
412+
413413
default:
414414
panic("condexpr_create: invalid expr type %d", (int)type);
415415
}

0 commit comments

Comments
 (0)