From 2b46a8cbba384f799321fc554d4d1c95563ea0a2 Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 5 Dec 2022 23:18:37 +0000 Subject: [PATCH] zap a pile of dangling tabs --- sys/kern/exec_elf.c | 6 +++--- sys/kern/exec_subr.c | 6 +++--- sys/kern/kern_bufq.c | 4 ++-- sys/kern/kern_descrip.c | 4 ++-- sys/kern/kern_exit.c | 4 ++-- sys/kern/kern_ktrace.c | 8 ++++---- sys/kern/kern_pledge.c | 4 ++-- sys/kern/kern_sched.c | 4 ++-- sys/kern/kern_sensors.c | 4 ++-- sys/kern/kern_tc.c | 6 +++--- sys/kern/kern_time.c | 4 ++-- sys/kern/kern_timeout.c | 6 +++--- sys/kern/kern_unveil.c | 4 ++-- sys/kern/kern_xxx.c | 4 ++-- sys/kern/makesyscalls.sh | 4 ++-- sys/kern/sched_bsd.c | 4 ++-- sys/kern/spec_vnops.c | 4 ++-- sys/kern/subr_extent.c | 4 ++-- sys/kern/sys_pipe.c | 4 ++-- sys/kern/sys_process.c | 4 ++-- sys/kern/uipc_syscalls.c | 6 +++--- sys/kern/uipc_usrreq.c | 4 ++-- sys/kern/vfs_getcwd.c | 8 ++++---- 23 files changed, 55 insertions(+), 55 deletions(-) diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c index 3cca0a1189b..2d34330eff3 100644 --- a/sys/kern/exec_elf.c +++ b/sys/kern/exec_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.c,v 1.176 2022/11/23 11:00:27 mbuhl Exp $ */ +/* $OpenBSD: exec_elf.c,v 1.177 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -882,11 +882,11 @@ elf_os_pt_note_name(Elf_Note *np) /* verify name padding (after the NUL) is NUL */ for (j = namlen + 1; j < elfround(np->namesz); j++) if (((char *)(np + 1))[j] != '\0') - continue; + continue; /* verify desc padding is NUL */ for (j = np->descsz; j < elfround(np->descsz); j++) if (((char *)(np + 1))[j] != '\0') - continue; + continue; if (strcmp((char *)(np + 1), elf_note_names[i].name) == 0) return elf_note_names[i].id; } diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c index 0637603f197..d444a8bbb25 100644 --- a/sys/kern/exec_subr.c +++ b/sys/kern/exec_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_subr.c,v 1.63 2022/11/17 18:53:12 deraadt Exp $ */ +/* $OpenBSD: exec_subr.c,v 1.64 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $ */ /* @@ -284,7 +284,7 @@ vmcmd_map_zero(struct proc *p, struct exec_vmcmd *cmd) if (cmd->ev_len == 0) return (0); - + KASSERT((cmd->ev_addr & PAGE_MASK) == 0); error = uvm_map(&p->p_vmspace->vm_map, &cmd->ev_addr, round_page(cmd->ev_len), NULL, UVM_UNKNOWN_OFFSET, 0, @@ -307,7 +307,7 @@ vmcmd_mutable(struct proc *p, struct exec_vmcmd *cmd) { if (cmd->ev_len == 0) return (0); - + /* ev_addr, ev_len may be misaligned, so maximize the region */ uvm_map_immutable(&p->p_vmspace->vm_map, trunc_page(cmd->ev_addr), round_page(cmd->ev_addr + cmd->ev_len), 0); diff --git a/sys/kern/kern_bufq.c b/sys/kern/kern_bufq.c index d42b2eccdb7..505770176c4 100644 --- a/sys/kern/kern_bufq.c +++ b/sys/kern/kern_bufq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_bufq.c,v 1.34 2022/08/14 01:58:27 jsg Exp $ */ +/* $OpenBSD: kern_bufq.c,v 1.35 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 2010 Thordur I. Bjornsson * Copyright (c) 2010 David Gwynne @@ -329,7 +329,7 @@ void bufq_fifo_destroy(void *data) { struct bufq_fifo_head *head = data; - + free(head, M_DEVBUF, sizeof(*head)); } diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index af547122ec3..fbd1a68a2f1 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.206 2022/08/14 01:58:27 jsg Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.207 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -636,7 +636,7 @@ restart: } out: FRELE(fp, p); - return (error); + return (error); } /* diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 56dd4cc5f03..2f1708609fb 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.207 2022/11/03 04:56:47 guenther Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.208 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -636,7 +636,7 @@ sys_wait4(struct proc *q, void *v, register_t *retval) if (SCARG(uap, options) &~ (WUNTRACED|WNOHANG|WCONTINUED)) return (EINVAL); - + if (SCARG(uap, pid) == WAIT_MYPGRP) { idtype = P_PGID; id = q->p_p->ps_pgid; diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index eb3a9557647..6ede5569311 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ktrace.c,v 1.108 2022/08/14 01:58:27 jsg Exp $ */ +/* $OpenBSD: kern_ktrace.c,v 1.109 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */ /* @@ -104,7 +104,7 @@ ktrsettrace(struct process *pr, int facs, struct vnode *newvp, /* nothing to change about where the trace goes? */ if (pr->ps_tracevp == newvp && pr->ps_tracecred == newcred) - return; + return; vref(newvp); crhold(newcred); @@ -351,7 +351,7 @@ ktrexec(struct proc *p, int type, const char *data, ssize_t len) struct ktr_header kth; int count; int buflen; - + assert(type == KTR_EXECARGS || type == KTR_EXECENV); atomic_setbits_int(&p->p_flag, P_INKTR); @@ -542,7 +542,7 @@ ktrops(struct proc *curp, struct process *pr, int ops, int facs, return (0); if (ops == KTROP_SET) ktrsettrace(pr, facs, vp, cred); - else { + else { /* KTROP_CLEAR */ pr->ps_traceflag &= ~facs; if ((pr->ps_traceflag & KTRFAC_MASK) == 0) { diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index de275db198c..13fcf77f88a 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.299 2022/11/10 00:14:11 jsg Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.300 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott @@ -943,7 +943,7 @@ pledge_sysctl(struct proc *p, int miblen, int *mib, void *new) if (miblen >= 3 && /* ntpd(8) to read sensors */ mib[0] == CTL_HW && mib[1] == HW_SENSORS) return (0); - + if (miblen == 6 && /* if_nameindex() */ mib[0] == CTL_NET && mib[1] == PF_ROUTE && mib[2] == 0 && mib[3] == 0 && mib[4] == NET_RT_IFNAMES) diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index 6a6057f16d8..7b84cd13c65 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sched.c,v 1.75 2022/08/14 01:58:27 jsg Exp $ */ +/* $OpenBSD: kern_sched.c,v 1.76 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 2007, 2008 Artur Grabowski * @@ -350,7 +350,7 @@ again: } KASSERT(p->p_wchan == NULL); - return (p); + return (p); } struct cpu_info * diff --git a/sys/kern/kern_sensors.c b/sys/kern/kern_sensors.c index 26db5c5f2e5..ab367f84837 100644 --- a/sys/kern/kern_sensors.c +++ b/sys/kern/kern_sensors.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sensors.c,v 1.39 2019/12/19 17:40:11 mpi Exp $ */ +/* $OpenBSD: kern_sensors.c,v 1.40 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -243,7 +243,7 @@ sensor_quiesce(void) sensors_quiesced = 1; while (sensors_running > 0) tsleep_nsec(&sensors_running, PZERO, "sensorpause", INFSLP); - + } void sensor_restart(void) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 297eccc95de..e8cc25b02d6 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_tc.c,v 1.79 2022/11/08 18:17:51 cheloha Exp $ */ +/* $OpenBSD: kern_tc.c,v 1.80 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 2000 Poul-Henning Kamp @@ -165,7 +165,7 @@ void microboottime(struct timeval *tvp) { struct bintime bt; - + binboottime(&bt); BINTIME_TO_TIMEVAL(&bt, tvp); } @@ -174,7 +174,7 @@ void nanoboottime(struct timespec *tsp) { struct bintime bt; - + binboottime(&bt); BINTIME_TO_TIMESPEC(&bt, tsp); } diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 45911a3867d..8a274cc0fc8 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_time.c,v 1.158 2022/10/12 13:39:50 kettenis Exp $ */ +/* $OpenBSD: kern_time.c,v 1.159 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $ */ /* @@ -443,7 +443,7 @@ sys_adjtime(struct proc *p, void *v, register_t *retval) struct timeval atv; const struct timeval *delta = SCARG(uap, delta); struct timeval *olddelta = SCARG(uap, olddelta); - int64_t adjustment, remaining; + int64_t adjustment, remaining; int error; error = pledge_adjtime(p, delta); diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 17d18394d4b..f1d5f723971 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_timeout.c,v 1.88 2022/11/11 18:09:58 cheloha Exp $ */ +/* $OpenBSD: kern_timeout.c,v 1.89 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 2001 Thomas Nordin * Copyright (c) 2000-2001 Artur Grabowski @@ -648,7 +648,7 @@ void softclock_process_kclock_timeout(struct timeout *to, int new) { struct kclock *kc = &timeout_kclock[to->to_kclock]; - + if (timespeccmp(&to->to_abstime, &kc->kc_lastscan, >)) { tostat.tos_scheduled++; if (!new) @@ -914,7 +914,7 @@ db_show_callout(db_expr_t addr, int haddr, db_expr_t count, char *modif) db_printf("%20s %8s\n", db_timespec(&kc->kc_lastscan), db_kclock(i)); } - db_printf("\n"); + db_printf("\n"); db_printf("%20s %8s %7s %*s %s\n", "remaining", "clock", "wheel", width, "arg", "func"); db_show_callout_bucket(&timeout_new); diff --git a/sys/kern/kern_unveil.c b/sys/kern/kern_unveil.c index 1ef665bf91c..492269e48a7 100644 --- a/sys/kern/kern_unveil.c +++ b/sys/kern/kern_unveil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_unveil.c,v 1.54 2022/08/14 01:58:27 jsg Exp $ */ +/* $OpenBSD: kern_unveil.c,v 1.55 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 2017-2019 Bob Beck @@ -600,7 +600,7 @@ unveil_start_relative(struct proc *p, struct nameidata *ni, struct vnode *dp) if (pr->ps_uvpaths == NULL) return; - + uv = unveil_lookup(dp, pr, NULL); if (uv == NULL) { uvi = unveil_find_cover(dp, p); diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index e56e1ed456a..4c843af2e9f 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_xxx.c,v 1.40 2022/11/03 04:52:41 guenther Exp $ */ +/* $OpenBSD: kern_xxx.c,v 1.41 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $ */ /* @@ -138,7 +138,7 @@ scdebug_ret(struct proc *p, register_t code, int error, if (!(scdebug & SCDEBUG_ALL || code < 0 || code >= SYS_MAXSYSCALL || sysent[code].sy_call == sys_nosys)) return; - + pr = p->p_p; printf("proc %d (%s): num ", pr->ps_pid, pr->ps_comm); if (code < 0 || code >= SYS_MAXSYSCALL) diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh index 9c761f3f712..96f4d6064aa 100644 --- a/sys/kern/makesyscalls.sh +++ b/sys/kern/makesyscalls.sh @@ -1,5 +1,5 @@ #! /bin/sh - -# $OpenBSD: makesyscalls.sh,v 1.17 2022/10/01 23:49:38 deraadt Exp $ +# $OpenBSD: makesyscalls.sh,v 1.18 2022/12/05 23:18:37 deraadt Exp $ # $NetBSD: makesyscalls.sh,v 1.26 1998/01/09 06:17:51 thorpej Exp $ # # Copyright (c) 1994,1996 Christopher G. Demetriou @@ -245,7 +245,7 @@ function parseline() { if ($f ~ /^[a-z0-9_]*$/) { # allow syscall alias funcalias=$f f++ - } + } if ($f != "{") parserr($f, "{") f++ diff --git a/sys/kern/sched_bsd.c b/sys/kern/sched_bsd.c index 0954e6c55b8..a02a529b866 100644 --- a/sys/kern/sched_bsd.c +++ b/sys/kern/sched_bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sched_bsd.c,v 1.72 2022/08/14 01:58:27 jsg Exp $ */ +/* $OpenBSD: sched_bsd.c,v 1.73 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- @@ -547,7 +547,7 @@ setperf_auto(void *v) speedup = 1; goto faster; } - + if (!idleticks) if (!(idleticks = mallocarray(ncpusfound, sizeof(*idleticks), M_DEVBUF, M_NOWAIT | M_ZERO))) diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c index 57474fb501a..f43ceda680f 100644 --- a/sys/kern/spec_vnops.c +++ b/sys/kern/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.110 2022/11/09 18:12:47 claudio Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.111 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -443,7 +443,7 @@ spec_strategy(void *v) struct vop_strategy_args *ap = v; struct buf *bp = ap->a_bp; int maj = major(bp->b_dev); - + if (LIST_FIRST(&bp->b_dep) != NULL) buf_start(bp); diff --git a/sys/kern/subr_extent.c b/sys/kern/subr_extent.c index 8208e4d1e13..be5690a9dba 100644 --- a/sys/kern/subr_extent.c +++ b/sys/kern/subr_extent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_extent.c,v 1.63 2020/01/11 14:30:24 mpi Exp $ */ +/* $OpenBSD: subr_extent.c,v 1.64 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: subr_extent.c,v 1.7 1996/11/21 18:46:34 cgd Exp $ */ /*- @@ -790,7 +790,7 @@ skip: */ goto fail; } - + last = rp; } diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 96cd4656cab..31f3ba45a52 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.142 2022/08/14 01:58:28 jsg Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.143 2022/12/05 23:18:37 deraadt Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -629,7 +629,7 @@ pipe_write(struct file *fp, struct uio *uio, int fflags) if (wpipe->pipe_state & PIPE_EOF) { error = EPIPE; break; - } + } } } pipe_iounlock(wpipe); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index be024e0f945..94bab785036 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_process.c,v 1.89 2021/12/07 04:19:24 guenther Exp $ */ +/* $OpenBSD: sys_process.c,v 1.90 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $ */ /*- @@ -881,7 +881,7 @@ process_auxv_offset(struct proc *curp, struct process *tr, struct uio *uiop) iov.iov_base = &pss; iov.iov_len = sizeof(pss); uio.uio_iov = &iov; - uio.uio_iovcnt = 1; + uio.uio_iovcnt = 1; uio.uio_offset = (off_t)tr->ps_strings; uio.uio_resid = sizeof(pss); uio.uio_segflg = UIO_SYSSPACE; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 900e6709ba2..4e5dd64402f 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.205 2022/11/30 13:58:39 kn Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.206 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -1636,13 +1636,13 @@ out: error = socreate(AF_INET, &so, SCARG(uap, type), 0); if (error) return (error); - + error = ypsockargs(&nam, &ypsin, sizeof ypsin, MT_SONAME); if (error) { soclose(so, MSG_DONTWAIT); return (error); } - + #ifdef KTRACE if (KTRPOINT(p, KTR_STRUCT)) ktrsockaddr(p, mtod(nam, caddr_t), sizeof(struct sockaddr_in)); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 9ab05f4b801..45267dd2071 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.194 2022/11/26 17:51:18 mvs Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.195 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -677,7 +677,7 @@ uipc_connect2(struct socket *so, struct socket *so2) { struct unpcb *unp = sotounpcb(so), *unp2; int error; - + if ((error = unp_connect2(so, so2))) return (error); diff --git a/sys/kern/vfs_getcwd.c b/sys/kern/vfs_getcwd.c index 8020b039099..e41cb2f54db 100644 --- a/sys/kern/vfs_getcwd.c +++ b/sys/kern/vfs_getcwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_getcwd.c,v 1.37 2022/08/14 01:58:28 jsg Exp $ */ +/* $OpenBSD: vfs_getcwd.c,v 1.38 2022/12/05 23:18:37 deraadt Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ /* @@ -61,7 +61,7 @@ vfs_getcwd_scandir(struct vnode **lvpp, struct vnode **uvpp, char **bpp, ino_t fileno; struct vattr va; struct vnode *uvp = NULL; - struct vnode *lvp = *lvpp; + struct vnode *lvp = *lvpp; struct componentname cn; tries = 0; @@ -251,7 +251,7 @@ vfs_getcwd_getcache(struct vnode **lvpp, struct vnode **uvpp, char **bpp, vput(uvp); *uvpp = NULL; - + error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY); if (!error) { *bpp = obp; /* restore the buffer */ @@ -324,7 +324,7 @@ vfs_getcwd_common(struct vnode *lvp, struct vnode *rvp, char **bpp, char *bufp, if (lvp == rvp) goto out; - + tvp = lvp; lvp = lvp->v_mount->mnt_vnodecovered; -- 2.20.1