From 9b2e535452929d6f2f798a2c01b23b1f547a0b0f Mon Sep 17 00:00:00 2001 From: "Rodney W. Grimes" Date: Tue, 30 May 1995 08:16:23 +0000 Subject: Remove trailing whitespace. --- sys/kern/imgact_aout.c | 6 +++--- sys/kern/imgact_gzip.c | 4 ++-- sys/kern/kern_clock.c | 12 ++++++------ sys/kern/kern_descrip.c | 6 +++--- sys/kern/kern_devconf.c | 6 +++--- sys/kern/kern_exec.c | 12 ++++++------ sys/kern/kern_exit.c | 4 ++-- sys/kern/kern_fork.c | 4 ++-- sys/kern/kern_ktrace.c | 18 +++++++++--------- sys/kern/kern_lkm.c | 18 +++++++++--------- sys/kern/kern_lockf.c | 6 +++--- sys/kern/kern_malloc.c | 4 ++-- sys/kern/kern_ntptime.c | 4 ++-- sys/kern/kern_physio.c | 6 +++--- sys/kern/kern_proc.c | 8 ++++---- sys/kern/kern_resource.c | 10 +++++----- sys/kern/kern_sig.c | 22 +++++++++++----------- sys/kern/kern_synch.c | 4 ++-- sys/kern/kern_sysctl.c | 8 ++++---- sys/kern/kern_tc.c | 12 ++++++------ sys/kern/kern_time.c | 4 ++-- sys/kern/kern_timeout.c | 12 ++++++------ sys/kern/kern_xxx.c | 4 ++-- sys/kern/subr_clist.c | 6 +++--- sys/kern/subr_disklabel.c | 10 +++++----- sys/kern/subr_diskslice.c | 4 ++-- sys/kern/subr_log.c | 4 ++-- sys/kern/subr_rlist.c | 30 +++++++++++++++--------------- sys/kern/subr_trap.c | 20 ++++++++++---------- sys/kern/sys_generic.c | 4 ++-- sys/kern/sys_process.c | 18 +++++++++--------- sys/kern/sys_socket.c | 6 +++--- sys/kern/sysv_msg.c | 4 ++-- sys/kern/sysv_sem.c | 4 ++-- sys/kern/sysv_shm.c | 14 +++++++------- sys/kern/tty.c | 4 ++-- sys/kern/tty_compat.c | 18 +++++++++--------- sys/kern/tty_conf.c | 4 ++-- sys/kern/tty_cons.c | 10 +++++----- sys/kern/tty_pty.c | 8 ++++---- sys/kern/tty_snoop.c | 14 +++++++------- sys/kern/tty_subr.c | 6 +++--- sys/kern/tty_tty.c | 4 ++-- sys/kern/uipc_sockbuf.c | 10 +++++----- sys/kern/uipc_socket.c | 4 ++-- sys/kern/uipc_socket2.c | 10 +++++----- sys/kern/uipc_syscalls.c | 14 +++++++------- sys/kern/uipc_usrreq.c | 8 ++++---- sys/kern/vfs_bio.c | 14 +++++++------- sys/kern/vfs_cache.c | 12 ++++++------ sys/kern/vfs_cluster.c | 6 +++--- sys/kern/vfs_init.c | 8 ++++---- sys/kern/vfs_lookup.c | 6 +++--- sys/kern/vfs_vnops.c | 4 ++-- 54 files changed, 241 insertions(+), 241 deletions(-) (limited to 'sys/kern') diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 003e9b22e84d..082088c81d1c 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_aout.c,v 1.11 1995/02/20 22:23:03 davidg Exp $ + * $Id: imgact_aout.c,v 1.12 1995/03/16 18:12:25 bde Exp $ */ #include @@ -56,7 +56,7 @@ exec_aout_imgact(iparams) #ifdef COMPAT_LINUX /* * Linux and *BSD binaries look very much alike, - * only the machine id is different: + * only the machine id is different: * 0x64 for Linux, 0x86 for *BSD. */ if (((a_out->a_magic >> 16) & 0xff) != 0x86) @@ -190,7 +190,7 @@ exec_aout_imgact(iparams) /* Fill in image_params */ iparams->interpreted = 0; iparams->entry_addr = a_out->a_entry; - + iparams->proc->p_sysent = &aout_sysvec; return (0); } diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index a7e5f3c3ac9f..1fb4c9213b04 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: imgact_gzip.c,v 1.12 1995/02/20 22:23:07 davidg Exp $ + * $Id: imgact_gzip.c,v 1.13 1995/03/16 18:12:27 bde Exp $ * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. @@ -119,7 +119,7 @@ exec_gzip_imgact(iparams) return igz.error; if (error) return ENOEXEC; - if (error2) + if (error2) return error2; return 0; } diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 62d2bcb38055..7a6d79b5fc05 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.11 1994/12/12 11:58:46 bde Exp $ + * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $ */ /* Portions of this software are covered by the following: */ @@ -459,7 +459,7 @@ hardclock(frame) statclock(frame); /* - * Increment the time-of-day. + * Increment the time-of-day. */ ticks++; { @@ -579,14 +579,14 @@ hardclock(frame) * replaced. */ switch (time_state) { - + case TIME_OK: if (time_status & STA_INS) time_state = TIME_INS; else if (time_status & STA_DEL) time_state = TIME_DEL; break; - + case TIME_INS: if (newtime.tv_sec % 86400 == 0) { newtime.tv_sec--; @@ -600,11 +600,11 @@ hardclock(frame) time_state = TIME_WAIT; } break; - + case TIME_OOP: time_state = TIME_WAIT; break; - + case TIME_WAIT: if (!(time_status & (STA_INS | STA_DEL))) time_state = TIME_OK; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 77d76b7aa443..07cec1b7d13c 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.8 1995/02/20 19:42:33 guido Exp $ + * $Id: kern_descrip.c,v 1.9 1995/03/28 07:56:26 bde Exp $ */ #include @@ -871,7 +871,7 @@ fdopen(dev, mode, type, p) /* * XXX Kludge: set curproc->p_dupfd to contain the value of the - * the file descriptor being sought for duplication. The error + * the file descriptor being sought for duplication. The error * return ensures that the vnode for this device will be released * by vn_open. Open will detect this special error and take the * actions in dupfdopen below. Other callers of vn_open or VOP_OPEN @@ -893,7 +893,7 @@ dupfdopen(fdp, indx, dfd, mode, error) { register struct file *wfp; struct file *fp; - + /* * If the to-be-dup'd fd number is greater than the allowed number * of file descriptors, or the fd to be dup'd has already been diff --git a/sys/kern/kern_devconf.c b/sys/kern/kern_devconf.c index 452349b6bfca..bcdf87e23ad4 100644 --- a/sys/kern/kern_devconf.c +++ b/sys/kern/kern_devconf.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_devconf.c,v 1.8 1995/03/17 04:17:32 davidg Exp $ + * $Id: kern_devconf.c,v 1.9 1995/04/13 15:33:14 wollman Exp $ */ /* @@ -172,7 +172,7 @@ dev_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, return rv; if(kdc->kdc_externalize) - rv = kdc->kdc_externalize(p, kdc, + rv = kdc->kdc_externalize(p, kdc, &((struct devconf *)oldp)->dc_data, len - ((sizeof dc) - 1)); if(rv) @@ -184,7 +184,7 @@ dev_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, if(!kdc->kdc_internalize) return EOPNOTSUPP; - rv = kdc->kdc_internalize(p, kdc, + rv = kdc->kdc_internalize(p, kdc, &((struct devconf *)newp)->dc_data, newlen - ((sizeof dc) - 1)); return rv; diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 612f68f7d57d..59a411bc8ddd 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_exec.c,v 1.19 1995/03/25 01:20:38 davidg Exp $ + * $Id: kern_exec.c,v 1.20 1995/03/25 01:34:21 davidg Exp $ */ #include @@ -123,7 +123,7 @@ interpret: if (error) { vm_map_remove(exec_map, (vm_offset_t)iparams->stringbase, (vm_offset_t)iparams->stringbase + ARG_MAX); - goto exec_fail; + goto exec_fail; } iparams->vnodep = vnodep = ndp->ni_vp; @@ -230,7 +230,7 @@ interpret: len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); p->p_comm[len] = 0; - + /* * mark as executable, wakeup any process that was vforked and tell * it that it now has it's own resources back @@ -240,7 +240,7 @@ interpret: p->p_flag &= ~P_PPWAIT; wakeup((caddr_t)p->p_pptr); } - + /* implement set userid/groupid */ p->p_flag &= ~P_SUGID; @@ -385,7 +385,7 @@ exec_extract_strings(iparams) * extract arguments first */ - argv = iparams->uap->argv; + argv = iparams->uap->argv; if (argv) { while ((argp = (caddr_t) fuword(argv++))) { @@ -407,7 +407,7 @@ exec_extract_strings(iparams) * extract environment strings */ - envv = iparams->uap->envv; + envv = iparams->uap->envv; if (envv) { while ((envp = (caddr_t) fuword(envv++))) { diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 3a8102c4b0b9..156dc47cf792 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $Id: kern_exit.c,v 1.13 1994/12/28 06:15:07 davidg Exp $ + * $Id: kern_exit.c,v 1.14 1995/03/16 18:12:31 bde Exp $ */ #include @@ -184,7 +184,7 @@ exit1(p, rv) p->p_rlimit[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY; (void)acct_process(p); #ifdef KTRACE - /* + /* * release trace file */ p->p_traceflag = 0; /* don't trace the vrele() */ diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 0e2ba90f804a..d1f671a2a9cc 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $Id: kern_fork.c,v 1.10 1995/01/21 15:08:57 bde Exp $ + * $Id: kern_fork.c,v 1.11 1995/03/16 18:12:32 bde Exp $ */ #include @@ -151,7 +151,7 @@ again: } if (p2->p_pid > nextpid && pidchecked > p2->p_pid) pidchecked = p2->p_pid; - if (p2->p_pgrp->pg_id > nextpid && + if (p2->p_pgrp->pg_id > nextpid && pidchecked > p2->p_pgrp->pg_id) pidchecked = p2->p_pgrp->pg_id; } diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 2bba4bb9ba9c..d89e2ca45052 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $Id: kern_ktrace.c,v 1.4 1994/08/18 22:35:01 wollman Exp $ + * $Id: kern_ktrace.c,v 1.5 1994/10/02 17:35:15 phk Exp $ */ #ifdef KTRACE @@ -53,7 +53,7 @@ ktrgetheader(type) register struct ktr_header *kth; struct proc *p = curproc; /* XXX */ - MALLOC(kth, struct ktr_header *, sizeof (struct ktr_header), + MALLOC(kth, struct ktr_header *, sizeof (struct ktr_header), M_TEMP, M_WAITOK); kth->ktr_type = type; microtime(&kth->ktr_time); @@ -143,7 +143,7 @@ ktrgenio(vp, fd, rw, iov, len, error) register caddr_t cp; register int resid = len, cnt; struct proc *p = curproc; /* XXX */ - + if (error) return; p->p_traceflag |= KTRFAC_ACTIVE; @@ -289,7 +289,7 @@ ktrace(curp, uap, retval) error = EINVAL; goto done; } - /* + /* * do it */ if (uap->pid < 0) { @@ -304,9 +304,9 @@ ktrace(curp, uap, retval) for (p = pg->pg_mem; p != NULL; p = p->p_pgrpnxt) if (descend) ret |= ktrsetchildren(curp, p, ops, facs, vp); - else + else ret |= ktrops(curp, p, ops, facs, vp); - + } else { /* * by pid @@ -340,7 +340,7 @@ ktrops(curp, p, ops, facs, vp) if (!ktrcanset(curp, p)) return (0); if (ops == KTROP_SET) { - if (p->p_tracep != vp) { + if (p->p_tracep != vp) { /* * if trace file already in use, relinquish */ @@ -352,7 +352,7 @@ ktrops(curp, p, ops, facs, vp) p->p_traceflag |= facs; if (curp->p_ucred->cr_uid == 0) p->p_traceflag |= KTRFAC_ROOT; - } else { + } else { /* KTROP_CLEAR */ if (((p->p_traceflag &= ~facs) & KTRFAC_MASK) == 0) { /* no more tracing */ @@ -453,7 +453,7 @@ ktrwrite(vp, kth) * Return true if caller has permission to set the ktracing state * of target. Essentially, the target can't possess any * more permissions than the caller. KTRFAC_ROOT signifies that - * root previously set the tracing status on the target process, and + * root previously set the tracing status on the target process, and * so, only root may further change it. * * TODO: check groups. use caller effective gid. diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index f808f6d3d2be..ccc7c4ef2550 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: kern_lkm.c,v 1.12 1995/04/20 05:08:31 wpaul Exp $ */ /* @@ -442,7 +442,7 @@ lkmcioctl(dev, cmd, data, flag) statp->size = curp->size / PAGESIZE; statp->private = (unsigned long)curp->private.lkm_any; statp->ver = curp->private.lkm_any->lkm_ver; - copystr(curp->private.lkm_any->lkm_name, + copystr(curp->private.lkm_any->lkm_name, statp->name, MAXLKMNAME - 2, NULL); @@ -547,11 +547,11 @@ _lkm_syscall(lkmtp, cmd) /* save old */ bcopy(&aout_sysvec.sv_table[i], - &(args->lkm_oldent), + &(args->lkm_oldent), sizeof(struct sysent)); /* replace with new */ - bcopy(args->lkm_sysent, + bcopy(args->lkm_sysent, &aout_sysvec.sv_table[i], sizeof(struct sysent)); @@ -565,8 +565,8 @@ _lkm_syscall(lkmtp, cmd) i = args->lkm_offset; /* replace current slot contents with old contents */ - bcopy(&(args->lkm_oldent), - &aout_sysvec.sv_table[i], + bcopy(&(args->lkm_oldent), + &aout_sysvec.sv_table[i], sizeof(struct sysent)); break; @@ -623,7 +623,7 @@ _lkm_vfs(lkmtp, cmd) for(i = 0; args->lkm_vnodeops->ls_items[i]; i++) { struct vnodeopv_desc *opv = (struct vnodeopv_desc *)args->lkm_vnodeops->ls_items[i]; - *(opv->opv_desc_vector_p) = NULL; + *(opv->opv_desc_vector_p) = NULL; } vfs_opv_init((struct vnodeopv_desc **)args->lkm_vnodeops->ls_items); @@ -813,7 +813,7 @@ _lkm_exec(lkmtp, cmd) struct lkm_exec *args = lkmtp->private.lkm_exec; int i; int err = 0; - const struct execsw **execsw = + const struct execsw **execsw = (const struct execsw **)&execsw_set.ls_items[0]; #if 1 @@ -882,7 +882,7 @@ TEXT_SET(execsw_set, lkm_exec_dummy); */ int lkmdispatch(lkmtp, cmd) - struct lkm_table *lkmtp; + struct lkm_table *lkmtp; int cmd; { int err = 0; /* default = success */ diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index aebcbf296b59..261c47f9efea 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94 - * $Id: kern_lockf.c,v 1.2 1994/09/25 19:33:37 phk Exp $ + * $Id: kern_lockf.c,v 1.3 1994/10/25 11:27:51 davidg Exp $ */ #include @@ -146,7 +146,7 @@ lf_advlock(ap, head, size) error = lf_getlock(lock, fl); FREE(lock, M_LOCKF); return (error); - + default: free(lock, M_LOCKF); return (EINVAL); @@ -747,7 +747,7 @@ lf_print(tag, lock) char *tag; register struct lockf *lock; { - + printf("%s: lock 0x%lx for ", tag, lock); if (lock->lf_flags & F_POSIX) printf("proc %d", ((struct proc *)(lock->lf_id))->p_pid); diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index ad0929d3af29..600e54f6b1ce 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.10 1995/03/19 14:28:52 davidg Exp $ + * $Id: kern_malloc.c,v 1.11 1995/04/16 11:25:15 davidg Exp $ */ #include @@ -374,7 +374,7 @@ kmeminit() npg = VM_KMEM_SIZE/ NBPG; if( npg > cnt.v_page_count) npg = cnt.v_page_count; - + kmemusage = (struct kmemusage *) kmem_alloc(kernel_map, (vm_size_t)(npg * sizeof(struct kmemusage))); kmem_map = kmem_suballoc(kernel_map, (vm_offset_t *)&kmembase, diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index aae22e7c37c9..a7006ef29d01 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -53,7 +53,7 @@ /* * The following variables are used by the hardclock() routine in the - * kern_clock.c module and are described in that module. + * kern_clock.c module and are described in that module. */ extern int time_state; /* clock state */ extern int time_status; /* clock status bits */ @@ -120,7 +120,7 @@ ntp_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, ntv.maxerror = time_maxerror; ntv.esterror = time_esterror; splx(s); - + ntv.time_state = time_state; /* diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index f8f4db8f14ca..b706dee37b85 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: kern_physio.c,v 1.9 1995/01/09 16:04:51 davidg Exp $ + * $Id: kern_physio.c,v 1.10 1995/03/16 18:12:34 bde Exp $ */ #include @@ -90,7 +90,7 @@ physio(strategy, bp, dev, rw, minp, uio) bp->b_saveaddr = sa; bp->b_blkno = btodb(uio->uio_offset); - + if (rw && !useracc(bp->b_data, bp->b_bufsize, B_WRITE)) { error = EFAULT; goto doerror; @@ -115,7 +115,7 @@ physio(strategy, bp, dev, rw, minp, uio) /* * update the uio data */ - { + { int iolen = bp->b_bcount - bp->b_resid; if (iolen == 0 && !(bp->b_flags & B_ERROR)) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 527d53b963d9..3fa8cf2da8d2 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.4 (Berkeley) 1/4/94 - * $Id: kern_proc.c,v 1.8 1994/10/09 07:34:57 davidg Exp $ + * $Id: kern_proc.c,v 1.9 1994/10/10 01:00:45 phk Exp $ */ #include @@ -303,7 +303,7 @@ pgdelete(pgrp) { register struct pgrp **pgp = &pgrphash[PIDHASH(pgrp->pg_id)]; - if (pgrp->pg_session->s_ttyp != NULL && + if (pgrp->pg_session->s_ttyp != NULL && pgrp->pg_session->s_ttyp->t_pgrp == pgrp) pgrp->pg_session->s_ttyp->t_pgrp = NULL; for (; *pgp; pgp = &(*pgp)->pg_hforw) { @@ -368,7 +368,7 @@ fixjobc(p, pgrp, entering) orphanpg(hispgrp); } -/* +/* * A process group has become orphaned; * if there are any stopped processes in the group, * hang-up all process in that group. @@ -406,7 +406,7 @@ pgrpdump() pgrp, pgrp->pg_id, pgrp->pg_session, pgrp->pg_session->s_count, pgrp->pg_mem); for (p=pgrp->pg_mem; p; p=p->p_pgrpnxt) { - printf("\t\tpid %d addr %x pgrp %x\n", + printf("\t\tpid %d addr %x pgrp %x\n", p->p_pid, p, p->p_pgrp); } } diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index d27ca57ba7f5..732888d78769 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_resource.c,v 1.10 1994/12/06 22:53:37 bde Exp $ + * $Id: kern_resource.c,v 1.11 1995/02/20 19:42:33 guido Exp $ */ #include @@ -144,7 +144,7 @@ setpriority(curp, uap, retval) case PRIO_PGRP: { register struct pgrp *pg; - + if (uap->who == 0) pg = curp->p_pgrp; else if ((pg = pgfind(uap->who)) == NULL) @@ -243,7 +243,7 @@ rtprio(curp, uap, retval) if (suser(pcred->pc_ucred, &curp->p_acflag)) { /* can't set someone else's */ if (uap->pid) - return (EPERM); + return (EPERM); /* can't set realtime priority */ if (rtp.type == RTP_PRIO_REALTIME) return (EPERM); @@ -259,7 +259,7 @@ rtprio(curp, uap, retval) default: return (EINVAL); } - + default: return (EINVAL); } @@ -355,7 +355,7 @@ dosetrlimit(p, which, limp) if (limp->rlim_max < 0) limp->rlim_max = RLIM_INFINITY; - if (limp->rlim_cur > alimp->rlim_max || + if (limp->rlim_cur > alimp->rlim_max || limp->rlim_max > alimp->rlim_max) if ((error = suser(p->p_ucred, &p->p_acflag))) return (error); diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 08ff42552d5f..28089127b82e 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $Id: kern_sig.c,v 1.9 1995/01/29 01:19:12 ats Exp $ + * $Id: kern_sig.c,v 1.10 1995/03/16 18:12:35 bde Exp $ */ #define SIGPROP /* include signal properties table */ @@ -266,7 +266,7 @@ sigprocmask(p, uap, retval) case SIG_SETMASK: p->p_sigmask = uap->mask &~ sigcantmask; break; - + default: error = EINVAL; break; @@ -507,13 +507,13 @@ killpg1(cp, signum, pgid, all) register struct pcred *pc = cp->p_cred; struct pgrp *pgrp; int nfound = 0; - - if (all) - /* - * broadcast + + if (all) + /* + * broadcast */ for (p = (struct proc *)allproc; p != NULL; p = p->p_next) { - if (p->p_pid <= 1 || p->p_flag & P_SYSTEM || + if (p->p_pid <= 1 || p->p_flag & P_SYSTEM || p == cp || !CANSIGNAL(cp, pc, p, signum)) continue; nfound++; @@ -521,8 +521,8 @@ killpg1(cp, signum, pgid, all) psignal(p, signum); } else { - if (pgid == 0) - /* + if (pgid == 0) + /* * zero pgid means send to my process group. */ pgrp = cp->p_pgrp; @@ -650,7 +650,7 @@ trapsignal(p, signum, code) p->p_stats->p_ru.ru_nsignals++; #ifdef KTRACE if (KTRPOINT(p, KTR_PSIG)) - ktrpsig(p->p_tracep, signum, ps->ps_sigact[signum], + ktrpsig(p->p_tracep, signum, ps->ps_sigact[signum], p->p_sigmask, code); #endif sendsig(ps->ps_sigact[signum], signum, p->p_sigmask, code); @@ -1134,7 +1134,7 @@ sigexit(p, signum) p->p_sigacts->ps_sig = signum; /* * Log signals which would cause core dumps - * (Log as LOG_INFO to appease those who don't want + * (Log as LOG_INFO to appease those who don't want * these messages.) * XXX : Todo, as well as euid, write out ruid too */ diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 4c977c7d651c..534e477d303f 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_synch.c,v 1.9 1994/12/12 06:04:27 davidg Exp $ + * $Id: kern_synch.c,v 1.10 1995/03/16 18:12:36 bde Exp $ */ #include @@ -108,7 +108,7 @@ roundrobin(arg) * We now need to prove two things: * 1) Given factor ** (5 * loadavg) ~= .1, prove factor == b/(b+1) * 2) Given b/(b+1) ** power ~= .1, prove power == (5 * loadavg) - * + * * Facts: * For x close to zero, exp(x) =~ 1 + x, since * exp(x) = 0! + x**1/1! + x**2/2! + ... . diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index ea9ed9a62423..cec5d558d392 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_sysctl.c,v 1.23 1995/03/16 18:12:37 bde Exp $ + * $Id: kern_sysctl.c,v 1.24 1995/05/12 19:17:31 wollman Exp $ */ /* @@ -230,7 +230,7 @@ kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) * `tsleep' takes a timeout argument of 0 as meaning * `no timeout'. */ - error = sysctl_int(oldp, oldlenp, newp, newlen, + error = sysctl_int(oldp, oldlenp, newp, newlen, &vfs_update_interval); if(!error) { wakeup(&vfs_update_wakeup); @@ -671,7 +671,7 @@ again: } if (buflen >= sizeof(struct kinfo_proc)) { fill_eproc(p, &eproc); - error = copyout((caddr_t)p, &dp->kp_proc, + error = copyout((caddr_t)p, &dp->kp_proc, sizeof(struct proc)); if (error) return (error); @@ -747,7 +747,7 @@ fill_eproc(p, ep) ep->e_tsess = tp->t_session; } else ep->e_tdev = NODEV; - if (ep->e_sess && ep->e_sess->s_ttyvp) + if (ep->e_sess && ep->e_sess->s_ttyvp) ep->e_flag = EPROC_CTTY; if (SESS_LEADER(p)) ep->e_flag |= EPROC_SLEADER; diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 62d2bcb38055..7a6d79b5fc05 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.11 1994/12/12 11:58:46 bde Exp $ + * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $ */ /* Portions of this software are covered by the following: */ @@ -459,7 +459,7 @@ hardclock(frame) statclock(frame); /* - * Increment the time-of-day. + * Increment the time-of-day. */ ticks++; { @@ -579,14 +579,14 @@ hardclock(frame) * replaced. */ switch (time_state) { - + case TIME_OK: if (time_status & STA_INS) time_state = TIME_INS; else if (time_status & STA_DEL) time_state = TIME_DEL; break; - + case TIME_INS: if (newtime.tv_sec % 86400 == 0) { newtime.tv_sec--; @@ -600,11 +600,11 @@ hardclock(frame) time_state = TIME_WAIT; } break; - + case TIME_OOP: time_state = TIME_WAIT; break; - + case TIME_WAIT: if (!(time_status & (STA_INS | STA_DEL))) time_state = TIME_OK; diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 5ab24de0410a..319b00ac5783 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $Id: kern_time.c,v 1.6 1995/02/14 06:33:53 phk Exp $ + * $Id: kern_time.c,v 1.7 1995/03/16 18:12:38 bde Exp $ */ #include @@ -44,7 +44,7 @@ #include -/* +/* * Time of day and interval timer support. * * These routines provide the kernel entry points to get and set diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 62d2bcb38055..7a6d79b5fc05 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.11 1994/12/12 11:58:46 bde Exp $ + * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $ */ /* Portions of this software are covered by the following: */ @@ -459,7 +459,7 @@ hardclock(frame) statclock(frame); /* - * Increment the time-of-day. + * Increment the time-of-day. */ ticks++; { @@ -579,14 +579,14 @@ hardclock(frame) * replaced. */ switch (time_state) { - + case TIME_OK: if (time_status & STA_INS) time_state = TIME_INS; else if (time_status & STA_DEL) time_state = TIME_DEL; break; - + case TIME_INS: if (newtime.tv_sec % 86400 == 0) { newtime.tv_sec--; @@ -600,11 +600,11 @@ hardclock(frame) time_state = TIME_WAIT; } break; - + case TIME_OOP: time_state = TIME_WAIT; break; - + case TIME_WAIT: if (!(time_status & (STA_INS | STA_DEL))) time_state = TIME_OK; diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 6ac6596bf96d..23439a01ae92 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_xxx.c 8.2 (Berkeley) 11/14/93 - * $Id: kern_xxx.c,v 1.8 1994/10/02 17:35:21 phk Exp $ + * $Id: kern_xxx.c,v 1.9 1994/12/04 19:58:43 phk Exp $ */ #include @@ -49,7 +49,7 @@ static void dummy_cleanup() {} TEXT_SET(cleanup_set, dummy_cleanup); - + typedef void (*cleanup_func_t)(void); extern const struct linker_set cleanup_set; static const cleanup_func_t *cleanups = diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c index a2615336b7c8..527b4393c94b 100644 --- a/sys/kern/subr_clist.c +++ b/sys/kern/subr_clist.c @@ -6,7 +6,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: tty_subr.c,v 1.8 1994/10/30 19:43:49 bde Exp $ + * $Id: tty_subr.c,v 1.9 1994/11/26 19:23:50 bde Exp $ */ /* @@ -433,7 +433,7 @@ b_to_q(src, amount, clistp) */ numc = min(amount, (char *)(cblockp + 1) - clistp->c_cl); bcopy(src, clistp->c_cl, numc); - + /* * Clear quote bits. The following could probably be made into * a seperate "bitzero()" routine, but why bother? @@ -548,7 +548,7 @@ unputc(clistp) cblockp = (struct cblock *)((long)clistp->c_cl & ~CROUND); /* - * Set quote flag if this character was quoted. + * Set quote flag if this character was quoted. */ if (isset(cblockp->c_quote, (u_char *)clistp->c_cl - cblockp->c_info)) chr |= TTY_QUOTE; diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index 8d4a6fdd9b83..958f5946e88b 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.13 1995/03/18 06:38:04 davidg Exp $ + * $Id: ufs_disksubr.c,v 1.14 1995/03/18 07:06:51 davidg Exp $ */ #include @@ -255,7 +255,7 @@ readdisklabel(dev, strat, lp, dp, bdp) * will be relative to the base of the BSD part. */ msgMSP = readMSPtolabel(dev, strat, lp, dp, &cyl ); - + /* * next, dig out disk label, relative to either the base of the * BSD part, or block 0, depending on if an MSP was found. @@ -481,7 +481,7 @@ writedisklabel(dev, strat, lp) * force OURPART to start at block 0 as a default in case there is NO * MSP. * readMSPtolabel() will reset it to start at the start of the BSD - * part if it exists + * part if it exists * At this time this is an error contition but I've left support for it */ lp->d_npartitions = OURPART + 1; @@ -491,7 +491,7 @@ writedisklabel(dev, strat, lp) msg = readMSPtolabel(dev, strat, lp, 0, &cyl ); /* - * If we want to be able to install without an Machine Specific + * If we want to be able to install without an Machine Specific * Partitioning , then * the failure of readMSPtolabel() should be made non fatal. */ @@ -515,7 +515,7 @@ writedisklabel(dev, strat, lp) /* * get all the other bits back from the good new disklabel * (the user wouldn't try confuse us would he?) - * With the exception of the OURPART which now points to the + * With the exception of the OURPART which now points to the * BSD partition. */ BSDstart = lp->d_partitions[OURPART].p_offset; diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 636002787b7a..618f4f40564a 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.12 1995/05/08 16:24:08 bde Exp $ + * $Id: subr_diskslice.c,v 1.13 1995/05/24 23:33:42 davidg Exp $ */ #include @@ -626,7 +626,7 @@ dsopen(dname, dev, mode, sspp, lp, strat, setgeom) set_ds_wlabel(ssp, slice, TRUE); /* XXX invert */ lp1 = malloc(sizeof *lp1, M_DEVBUF, M_WAITOK); *lp1 = *lp; - lp = lp1; + lp = lp1; TRACE(("readdisklabel\n")); msg = correct_readdisklabel(dkmodpart(dev, RAW_PART), strat, lp); #if 0 /* XXX */ diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 394bf9f00904..d4e181ef6976 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $Id: subr_log.c,v 1.6 1995/04/29 05:09:19 jkh Exp $ + * $Id: subr_log.c,v 1.7 1995/04/29 11:36:47 jkh Exp $ */ /* @@ -181,7 +181,7 @@ logwakeup() selwakeup(&logsoftc.sc_selp); if (logsoftc.sc_state & LOG_ASYNC) { if (logsoftc.sc_pgid < 0) - gsignal(-logsoftc.sc_pgid, SIGIO); + gsignal(-logsoftc.sc_pgid, SIGIO); else if ((p = pfind(logsoftc.sc_pgid))) psignal(p, SIGIO); } diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c index c64b685c5a57..0bc6f4cc4eb5 100644 --- a/sys/kern/subr_rlist.c +++ b/sys/kern/subr_rlist.c @@ -12,25 +12,25 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This software is a component of "386BSD" developed by + * This software is a component of "386BSD" developed by William F. Jolitz, TeleMuse. * 4. Neither the name of the developer nor the name "386BSD" * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * THIS SOFTWARE IS A COMPONENT OF 386BSD DEVELOPED BY WILLIAM F. JOLITZ - * AND IS INTENDED FOR RESEARCH AND EDUCATIONAL PURPOSES ONLY. THIS - * SOFTWARE SHOULD NOT BE CONSIDERED TO BE A COMMERCIAL PRODUCT. - * THE DEVELOPER URGES THAT USERS WHO REQUIRE A COMMERCIAL PRODUCT + * THIS SOFTWARE IS A COMPONENT OF 386BSD DEVELOPED BY WILLIAM F. JOLITZ + * AND IS INTENDED FOR RESEARCH AND EDUCATIONAL PURPOSES ONLY. THIS + * SOFTWARE SHOULD NOT BE CONSIDERED TO BE A COMMERCIAL PRODUCT. + * THE DEVELOPER URGES THAT USERS WHO REQUIRE A COMMERCIAL PRODUCT * NOT MAKE USE THIS WORK. * * FOR USERS WHO WISH TO UNDERSTAND THE 386BSD SYSTEM DEVELOPED - * BY WILLIAM F. JOLITZ, WE RECOMMEND THE USER STUDY WRITTEN - * REFERENCES SUCH AS THE "PORTING UNIX TO THE 386" SERIES - * (BEGINNING JANUARY 1991 "DR. DOBBS JOURNAL", USA AND BEGINNING - * JUNE 1991 "UNIX MAGAZIN", GERMANY) BY WILLIAM F. JOLITZ AND - * LYNNE GREER JOLITZ, AS WELL AS OTHER BOOKS ON UNIX AND THE - * ON-LINE 386BSD USER MANUAL BEFORE USE. A BOOK DISCUSSING THE INTERNALS + * BY WILLIAM F. JOLITZ, WE RECOMMEND THE USER STUDY WRITTEN + * REFERENCES SUCH AS THE "PORTING UNIX TO THE 386" SERIES + * (BEGINNING JANUARY 1991 "DR. DOBBS JOURNAL", USA AND BEGINNING + * JUNE 1991 "UNIX MAGAZIN", GERMANY) BY WILLIAM F. JOLITZ AND + * LYNNE GREER JOLITZ, AS WELL AS OTHER BOOKS ON UNIX AND THE + * ON-LINE 386BSD USER MANUAL BEFORE USE. A BOOK DISCUSSING THE INTERNALS * OF 386BSD ENTITLED "386BSD FROM THE INSIDE OUT" WILL BE AVAILABLE LATE 1992. * * THIS SOFTWARE IS PROVIDED BY THE DEVELOPER ``AS IS'' AND @@ -54,7 +54,7 @@ * functioning of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: subr_rlist.c,v 1.8 1995/01/31 06:48:53 davidg Exp $ + * $Id: subr_rlist.c,v 1.9 1995/03/16 18:12:41 bde Exp $ */ #include @@ -87,7 +87,7 @@ rlist_malloc() splx(s); if( !rl) break; - + for(i=0;i<(NBPG/(sizeof *rl));i++) { rl->rl_next = rlfree; rlfree = rl; @@ -98,7 +98,7 @@ rlist_malloc() if( (rl = rlfree) == 0 ) panic("Cannot get an rlist entry"); - + --rlist_count; rlfree = rl->rl_next; return rl; @@ -111,7 +111,7 @@ rlist_mfree( struct rlist *rl) rlfree = rl; ++rlist_count; } - + void rlist_free(rlp, start, end) struct rlist **rlp; diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 6ca87c2c6044..5e1489aaadce 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.50 1995/03/21 07:02:51 davidg Exp $ + * $Id: trap.c,v 1.51 1995/03/21 07:16:12 davidg Exp $ */ /* @@ -174,7 +174,7 @@ trap(frame) type = frame.tf_trapno; code = frame.tf_err; - + if (ISPL(frame.tf_cs) == SEL_UPL) { /* user trap */ @@ -262,7 +262,7 @@ trap(frame) return; #endif /* NNPX > 0 */ -#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) +#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) i = math_emulate(&frame); if (i == 0) { if (!(frame.tf_eflags & PSL_T)) @@ -352,7 +352,7 @@ trap(frame) frame.tf_eflags &= ~PSL_T; return; #endif - + #if NISA > 0 case T_NMI: #ifdef DDB @@ -376,7 +376,7 @@ trap(frame) #ifdef DEBUG eva = rcr2(); if (type <= MAX_TRAP_MSG) { - uprintf("fatal process exception: %s", + uprintf("fatal process exception: %s", trap_msg[type]); if ((type == T_PAGEFLT) || (type == T_PROTFLT)) uprintf(", fault VA = 0x%x", eva); @@ -464,7 +464,7 @@ trap_pfault(frame, usermode) v = (vm_offset_t) vtopte(va); /* Fault the pte only if needed: */ - *(volatile char *)v += 0; + *(volatile char *)v += 0; pmap_use_pt( vm_map_pmap(map), va); @@ -580,7 +580,7 @@ trap_pfault(frame, usermode) */ /* Fault the pte only if needed: */ - *(volatile char *)v += 0; + *(volatile char *)v += 0; pmap_use_pt( vm_map_pmap(map), va); @@ -804,7 +804,7 @@ syscall(frame) if (p->p_sysent->sv_mask) code = code & p->p_sysent->sv_mask; - + if (code >= p->p_sysent->sv_size) callp = &p->p_sysent->sv_table[0]; else @@ -852,7 +852,7 @@ syscall(frame) if (p->p_sysent->sv_errsize) if (error >= p->p_sysent->sv_errsize) error = -1; /* XXX */ - else + else error = p->p_sysent->sv_errtbl[error]; frame.tf_eax = error; frame.tf_eflags |= PSL_C; /* carry bit */ @@ -966,7 +966,7 @@ linux_syscall(frame) if (p->p_sysent->sv_errsize) if (error >= p->p_sysent->sv_errsize) error = -1; /* XXX */ - else + else error = p->p_sysent->sv_errtbl[error]; frame.tf_eax = -error; frame.tf_eflags |= PSL_C; /* carry bit */ diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index e88e789ffec8..d4641221b98a 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $Id: sys_generic.c,v 1.11 1995/04/13 15:27:51 davidg Exp $ + * $Id: sys_generic.c,v 1.12 1995/04/13 18:24:33 davidg Exp $ */ #include @@ -445,7 +445,7 @@ ioctl(p, uap, retval) *(caddr_t *)data = uap->data; #ifdef COMPAT_IBCS2 else if (com) - /* + /* * Pick up such things as NIOCxx. * Any copyouts will have to be done prior * to return by their servicing code. diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 350433cb910c..4a01c60cdfb2 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sys_process.c,v 1.12 1995/03/16 18:12:42 bde Exp $ + * $Id: sys_process.c,v 1.13 1995/05/12 21:39:48 davidg Exp $ */ #include @@ -65,16 +65,16 @@ pread (struct proc *procp, unsigned int addr, unsigned int *retval) { page_offset = addr - trunc_page(addr); pageno = trunc_page(addr); - + tmap = map; rv = vm_map_lookup (&tmap, pageno, VM_PROT_READ, &out_entry, &object, &off, &out_prot, &wired, &single_use); if (rv != KERN_SUCCESS) return EINVAL; - + vm_map_lookup_done (tmap, out_entry); - + /* Find space in kernel_map for the page we're interested in */ rv = vm_map_find (kernel_map, object, off, &kva, PAGE_SIZE, 1); @@ -108,12 +108,12 @@ pwrite (struct proc *procp, unsigned int addr, unsigned int datum) { boolean_t fix_prot = 0; /* Map page into kernel space */ - + map = &procp->p_vmspace->vm_map; - + page_offset = addr - trunc_page(addr); pageno = trunc_page(addr); - + /* * Check the permissions for the area we're interested in. */ @@ -151,7 +151,7 @@ pwrite (struct proc *procp, unsigned int addr, unsigned int datum) { */ vm_map_lookup_done (tmap, out_entry); - + /* * Fault the page in... */ @@ -176,7 +176,7 @@ pwrite (struct proc *procp, unsigned int addr, unsigned int datum) { } vm_map_remove (kernel_map, kva, kva + PAGE_SIZE); } - + if (fix_prot) vm_map_protect (map, pageno, pageno + PAGE_SIZE, VM_PROT_READ|VM_PROT_EXECUTE, 0); diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index f7ced539ba03..92cbedc4b504 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sys_socket.c 8.1 (Berkeley) 6/10/93 - * $Id: sys_socket.c,v 1.3 1994/08/02 07:42:42 davidg Exp $ + * $Id: sys_socket.c,v 1.4 1994/10/02 17:35:25 phk Exp $ */ #include @@ -131,7 +131,7 @@ soo_ioctl(fp, cmd, data, p) return (ifioctl(so, cmd, data, p)); if (IOCGROUP(cmd) == 'r') return (rtioctl(cmd, data, p)); - return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, + return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, (struct mbuf *)cmd, (struct mbuf *)data, (struct mbuf *)0)); } @@ -186,7 +186,7 @@ soo_stat(so, ub) bzero((caddr_t)ub, sizeof (*ub)); ub->st_mode = S_IFSOCK; return ((*so->so_proto->pr_usrreq)(so, PRU_SENSE, - (struct mbuf *)ub, (struct mbuf *)0, + (struct mbuf *)ub, (struct mbuf *)0, (struct mbuf *)0)); } diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 4ef4bf70d3d9..4444f6e6acf4 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1,4 +1,4 @@ -/* $Id: sysv_msg.c,v 1.2 1994/09/17 13:24:16 davidg Exp $ */ +/* $Id: sysv_msg.c,v 1.3 1994/10/02 17:35:26 phk Exp $ */ /* * Implementation of SVID messages @@ -341,7 +341,7 @@ msgget(p, uap, retval) #ifdef MSG_DEBUG_OK printf("no more msqid_ds's available\n"); #endif - return(ENOSPC); + return(ENOSPC); } #ifdef MSG_DEBUG_OK printf("msqid %d is available\n", msqid); diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 9bafdfff52d5..0be0e3474517 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,4 +1,4 @@ -/* $Id: sysv_sem.c,v 1.3 1994/10/02 17:35:27 phk Exp $ */ +/* $Id: sysv_sem.c,v 1.4 1994/10/06 21:06:32 davidg Exp $ */ /* * Implementation of SVID semaphores @@ -620,7 +620,7 @@ semop(p, uap, retval) return(eval); } - /* + /* * Loop trying to satisfy the vector of requests. * If we reach a point where we must wait, any requests already * performed are rolled back and we go to sleep until some other diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 09fe34b5723c..de8379c2dd62 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.3 1994/10/02 17:35:28 phk Exp $ */ +/* $Id: sysv_shm.c,v 1.4 1995/02/20 22:23:13 davidg Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* @@ -64,7 +64,7 @@ int oshmctl(); int shmat(), shmctl(), shmdt(), shmget(); int (*shmcalls[])() = { shmat, oshmctl, shmdt, shmget, shmctl }; - + #define SHMSEG_FREE 0x0200 #define SHMSEG_REMOVED 0x0400 #define SHMSEG_ALLOCATED 0x0800 @@ -143,7 +143,7 @@ shm_delete_mapping(p, shmmap_s) struct shmid_ds *shmseg; int segnum, result; size_t size; - + segnum = IPCID_TO_IX(shmmap_s->shmid); shmseg = &shmsegs[segnum]; size = (shmseg->shm_segsz + CLOFSET) & ~CLOFSET; @@ -230,7 +230,7 @@ shmat(p, uap, retval) flags = MAP_ANON | MAP_SHARED; if (uap->shmaddr) { flags |= MAP_FIXED; - if (uap->shmflg & SHM_RND) + if (uap->shmflg & SHM_RND) attach_va = (vm_offset_t)uap->shmaddr & ~(SHMLBA-1); else if (((vm_offset_t)uap->shmaddr & (SHMLBA-1)) == 0) attach_va = (vm_offset_t)uap->shmaddr; @@ -311,7 +311,7 @@ oshmctl(p, uap, retval) #else return EINVAL; #endif -} +} struct shmctl_args { int shmid; @@ -428,7 +428,7 @@ shmget_allocate_segment(p, uap, mode, retval) struct ucred *cred = p->p_ucred; struct shmid_ds *shmseg; struct shm_handle *shm_handle; - + if (uap->size < shminfo.shmmin || uap->size > shminfo.shmmax) return EINVAL; if (shm_nused >= shminfo.shmmni) /* any shmids left? */ @@ -510,7 +510,7 @@ shmget(p, uap, retval) goto again; return error; } - if ((uap->shmflg & IPC_CREAT) == 0) + if ((uap->shmflg & IPC_CREAT) == 0) return ENOENT; } return shmget_allocate_segment(p, uap, mode, retval); diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 66fec9e64094..b5b5f67e6f1f 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.43 1995/05/07 06:32:28 bde Exp $ + * $Id: tty.c,v 1.44 1995/05/07 23:53:36 ache Exp $ */ #include "snp.h" @@ -208,7 +208,7 @@ ttyclose(tp) clist_free_cblocks(&tp->t_rawq); #if NSNP > 0 - if (ISSET(tp->t_state, TS_SNOOP) && tp->t_sc != NULL) + if (ISSET(tp->t_state, TS_SNOOP) && tp->t_sc != NULL) snpdown((struct snoop *)tp->t_sc); #endif diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index b420d466d3cf..9b4b73129bad 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * @(#)tty_compat.c 8.1 (Berkeley) 6/10/93 - * $Id: tty_compat.c,v 1.11 1995/04/02 19:26:50 ache Exp $ + * $Id: tty_compat.c,v 1.12 1995/04/11 17:54:25 ache Exp $ */ -/* +/* * mapping routines for old line discipline (yuck) */ #if defined(COMPAT_43) || defined(COMPAT_SUNOS) @@ -146,7 +146,7 @@ int ttsetcompat(tp, com, data, term) if (*com == TIOCLSET) tp->t_flags = (tp->t_flags&0xffff) | *(int *)data<<16; else { - tp->t_flags = + tp->t_flags = (ttcompatgetflags(tp)&0xffff0000)|(tp->t_flags&0xffff); if (*com == TIOCLBIS) tp->t_flags |= *(int *)data<<16; @@ -228,7 +228,7 @@ ttcompat(tp, com, data, flag) } case TIOCLGET: tp->t_flags = - (ttcompatgetflags(tp) & 0xffff0000UL) + (ttcompatgetflags(tp) & 0xffff0000UL) | (tp->t_flags & 0xffff); *(int *)data = tp->t_flags>>16; if (ttydebug) @@ -242,7 +242,7 @@ ttcompat(tp, com, data, flag) case OTIOCSETD: { int ldisczero = 0; - return (ttioctl(tp, TIOCSETD, + return (ttioctl(tp, TIOCSETD, *(int *)data == 2 ? (caddr_t)&ldisczero : data, flag)); } @@ -284,8 +284,8 @@ ttcompatgetflags(tp) } else flags |= EVENP | ODDP; } - - if ((lflag&ICANON) == 0) { + + if ((lflag&ICANON) == 0) { /* fudge */ if (iflag&(INPCK|ISTRIP|IXON) || lflag&(IEXTEN|ISIG) || cflag&(CSIZE|PARENB) != CS8) @@ -355,7 +355,7 @@ ttcompatsetflags(tp, t) lflag |= ECHO; else lflag &= ~ECHO; - + cflag &= ~(CSIZE|PARENB); if (flags&(RAW|LITOUT|PASS8)) { cflag |= CS8; @@ -379,7 +379,7 @@ ttcompatsetflags(tp, t) } else if ((flags&(EVENP|ODDP)) == ODDP) { iflag |= INPCK; cflag |= PARODD; - } else + } else iflag &= ~INPCK; if (flags&TANDEM) iflag |= IXOFF; diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index e565c61d80b8..c2acc9b35644 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty_conf.c 8.4 (Berkeley) 1/21/94 - * $Id: tty_conf.c,v 1.4 1994/10/05 21:22:24 wollman Exp $ + * $Id: tty_conf.c,v 1.5 1995/03/21 11:23:58 dufault Exp $ */ #include @@ -89,7 +89,7 @@ struct linesw linesw[MAXLDISC] = int nlinesw = sizeof (linesw) / sizeof (linesw[0]); -static struct linesw nodisc = +static struct linesw nodisc = { ttynodisc, ttyerrclose, diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 3076fab1f29c..1500ff20382f 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.26 1995/04/23 12:55:54 bde Exp $ + * $Id: cons.c,v 1.27 1995/04/24 16:42:59 bde Exp $ */ #include @@ -135,7 +135,7 @@ cnopen(dev, flag, mode, p) } return (retval); } - + int cnclose(dev, flag, mode, p) dev_t dev; @@ -168,7 +168,7 @@ cnclose(dev, flag, mode, p) } return ((*cn_phys_close)(dev, flag, mode, p)); } - + int cnread(dev, uio, flag) dev_t dev; @@ -180,7 +180,7 @@ cnread(dev, uio, flag) dev = cn_tab->cn_dev; return ((*cdevsw[major(dev)].d_read)(dev, uio, flag)); } - + int cnwrite(dev, uio, flag) dev_t dev; @@ -195,7 +195,7 @@ cnwrite(dev, uio, flag) dev = cn_tab->cn_dev; return ((*cdevsw[major(dev)].d_write)(dev, uio, flag)); } - + int cnioctl(dev, cmd, data, flag, p) dev_t dev; diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index a2f913b34fd5..182efaef26c3 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_pty.c,v 1.9 1995/04/09 22:28:24 ache Exp $ + * $Id: tty_pty.c,v 1.10 1995/04/10 01:45:43 ache Exp $ */ /* @@ -185,7 +185,7 @@ again: p->p_flag & P_PPWAIT) return (EIO); pgsignal(p->p_pgrp, SIGTTIN, 1); - error = ttysleep(tp, (caddr_t)&lbolt, + error = ttysleep(tp, (caddr_t)&lbolt, TTIPRI | PCATCH, ttybg, 0); if (error) return (error); @@ -641,7 +641,7 @@ ptyioctl(dev, cmd, data, flag, p) return (0); #ifdef COMPAT_43 - case TIOCSETP: + case TIOCSETP: case TIOCSETN: #endif case TIOCSETD: @@ -701,7 +701,7 @@ ptyioctl(dev, cmd, data, flag, p) break; } } - stop = (tp->t_iflag & IXON) && CCEQ(cc[VSTOP], CTRL('s')) + stop = (tp->t_iflag & IXON) && CCEQ(cc[VSTOP], CTRL('s')) && CCEQ(cc[VSTART], CTRL('q')); if (pti->pt_flags & PF_NOSTOP) { if (stop) { diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index e36af000a998..503836b79a65 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.c @@ -63,7 +63,7 @@ snpwrite(dev, uio, flag) int unit = minor(dev), len, i, error; struct snoop *snp = &snoopsw[unit]; struct tty *tp; - char c[SNP_INPUT_BUF]; + char c[SNP_INPUT_BUF]; if (snp->snp_tty == NULL) return (EIO); @@ -71,16 +71,16 @@ snpwrite(dev, uio, flag) tp = snp->snp_tty; if ((tp->t_sc == snp) && (tp->t_state & TS_SNOOP) && - (tp->t_line == OTTYDISC || tp->t_line == NTTYDISC)) + (tp->t_line == OTTYDISC || tp->t_line == NTTYDISC)) goto tty_input; printf("Snoop: attempt to write to bad tty.\n"); return (EIO); tty_input: - if (!(tp->t_state & TS_ISOPEN)) + if (!(tp->t_state & TS_ISOPEN)) return (EIO); - + while (uio->uio_resid > 0) { len = MIN(uio->uio_resid,SNP_INPUT_BUF); if ((error = uiomove(c, len, uio)) != 0) @@ -91,7 +91,7 @@ tty_input: } } return 0; - + } @@ -443,7 +443,7 @@ snpioctl(dev, cmd, data, flag) s = spltty(); if (snp->snp_tty != NULL) *(int *) data = snp->snp_len; - else + else if (snp->snp_flags & SNOOP_DOWN) { if (snp->snp_flags & SNOOP_OFLOW) *(int *) data = SNP_OFLOW; @@ -473,7 +473,7 @@ snpselect(dev, rw, p) if (rw != FREAD) return 1; - + if (snp->snp_len > 0) return 1; diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index a2615336b7c8..527b4393c94b 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -6,7 +6,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: tty_subr.c,v 1.8 1994/10/30 19:43:49 bde Exp $ + * $Id: tty_subr.c,v 1.9 1994/11/26 19:23:50 bde Exp $ */ /* @@ -433,7 +433,7 @@ b_to_q(src, amount, clistp) */ numc = min(amount, (char *)(cblockp + 1) - clistp->c_cl); bcopy(src, clistp->c_cl, numc); - + /* * Clear quote bits. The following could probably be made into * a seperate "bitzero()" routine, but why bother? @@ -548,7 +548,7 @@ unputc(clistp) cblockp = (struct cblock *)((long)clistp->c_cl & ~CROUND); /* - * Set quote flag if this character was quoted. + * Set quote flag if this character was quoted. */ if (isset(cblockp->c_quote, (u_char *)clistp->c_cl - cblockp->c_info)) chr |= TTY_QUOTE; diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index e3c503525976..9fe7f33e0b90 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_tty.c,v 1.3 1994/08/02 07:42:57 davidg Exp $ + * $Id: tty_tty.c,v 1.4 1994/12/04 01:46:13 ache Exp $ */ /* @@ -66,7 +66,7 @@ cttyopen(dev, flag, mode, p) * Since group is tty and mode is 620 on most terminal lines * and since sessions protect terminals from processes outside * your session, this check is probably no longer necessary. - * Since it inhibits setuid root programs that later switch + * Since it inhibits setuid root programs that later switch * to another user from accessing /dev/tty, we have decided * to delete this test. (mckusick 5/93) */ diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 2da76430d8a6..3f7d082dd68d 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.3 1994/08/02 07:43:08 davidg Exp $ + * $Id: uipc_socket2.c,v 1.4 1994/10/02 17:35:33 phk Exp $ */ #include @@ -79,7 +79,7 @@ u_long sb_max = SB_MAX; /* patchable */ * structure queued on so_q0 by calling sonewconn(). When the connection * is established, soisconnected() is called, and transfers the * socket structure to so_q, making it available to accept(). - * + * * If a socket is closed with sockets on either * so_q0 or so_q, these sockets are dropped. * @@ -162,7 +162,7 @@ sonewconn1(head, connstatus) if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2) return ((struct socket *)0); MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_DONTWAIT); - if (so == NULL) + if (so == NULL) return ((struct socket *)0); bzero((caddr_t)so, sizeof(*so)); so->so_type = head->so_type; @@ -281,7 +281,7 @@ sbwait(sb) sb->sb_timeo)); } -/* +/* * Lock a sockbuf already known to be locked; * return any error returned from sleep (EINTR). */ @@ -293,7 +293,7 @@ sb_lock(sb) while (sb->sb_flags & SB_LOCK) { sb->sb_flags |= SB_WANT; - error = tsleep((caddr_t)&sb->sb_flags, + error = tsleep((caddr_t)&sb->sb_flags, (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH, netio, 0); if (error) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 5e3bd9798ea3..90346e236672 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $Id: uipc_socket.c,v 1.8 1995/02/07 02:01:14 wollman Exp $ + * $Id: uipc_socket.c,v 1.9 1995/02/16 01:07:43 wollman Exp $ */ #include @@ -793,7 +793,7 @@ dontblock: splx(s); goto restart; } - + if (flagsp) *flagsp |= flags; release: diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 2da76430d8a6..3f7d082dd68d 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.3 1994/08/02 07:43:08 davidg Exp $ + * $Id: uipc_socket2.c,v 1.4 1994/10/02 17:35:33 phk Exp $ */ #include @@ -79,7 +79,7 @@ u_long sb_max = SB_MAX; /* patchable */ * structure queued on so_q0 by calling sonewconn(). When the connection * is established, soisconnected() is called, and transfers the * socket structure to so_q, making it available to accept(). - * + * * If a socket is closed with sockets on either * so_q0 or so_q, these sockets are dropped. * @@ -162,7 +162,7 @@ sonewconn1(head, connstatus) if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2) return ((struct socket *)0); MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_DONTWAIT); - if (so == NULL) + if (so == NULL) return ((struct socket *)0); bzero((caddr_t)so, sizeof(*so)); so->so_type = head->so_type; @@ -281,7 +281,7 @@ sbwait(sb) sb->sb_timeo)); } -/* +/* * Lock a sockbuf already known to be locked; * return any error returned from sleep (EINTR). */ @@ -293,7 +293,7 @@ sb_lock(sb) while (sb->sb_flags & SB_LOCK) { sb->sb_flags |= SB_WANT; - error = tsleep((caddr_t)&sb->sb_flags, + error = tsleep((caddr_t)&sb->sb_flags, (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH, netio, 0); if (error) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index d9a44e591082..7c0864e5170d 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $Id: uipc_syscalls.c,v 1.4 1994/10/02 17:35:35 phk Exp $ + * $Id: uipc_syscalls.c,v 1.5 1995/03/16 18:12:46 bde Exp $ */ #include @@ -238,7 +238,7 @@ accept1(p, uap, retval) return (error); } -#ifdef COMPAT_OLDSOCK +#ifdef COMPAT_OLDSOCK int accept(p, uap, retval) struct proc *p; @@ -398,7 +398,7 @@ sendit(p, s, mp, flags, retsize) #ifdef KTRACE struct iovec *ktriov = NULL; #endif - + error = getsock(p->p_fd, s, &fp); if (error) return (error); @@ -564,7 +564,7 @@ osendmsg(p, uap, retval) if ((u_int)msg.msg_iovlen >= UIO_MAXIOV) return (EMSGSIZE); MALLOC(iov, struct iovec *, - sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV, + sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV, M_WAITOK); } else iov = aiov; @@ -649,7 +649,7 @@ recvit(p, s, mp, namelenp, retsize) #ifdef KTRACE struct iovec *ktriov = NULL; #endif - + error = getsock(p->p_fd, s, &fp); if (error) return (error); @@ -1096,7 +1096,7 @@ struct getsockname_args { #endif }; -#ifndef COMPAT_OLDSOCK +#ifndef COMPAT_OLDSOCK #define getsockname1 getsockname #endif @@ -1178,7 +1178,7 @@ struct getpeername_args { }; -#ifndef COMPAT_OLDSOCK +#ifndef COMPAT_OLDSOCK #define getpeername1 getpeername #endif diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index f4255265d496..a54a46a20dae 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.7 1995/02/15 11:30:35 davidg Exp $ + * $Id: uipc_usrreq.c,v 1.8 1995/05/11 00:13:06 wollman Exp $ */ #include @@ -228,7 +228,7 @@ uipc_usrreq(so, req, m, nam, control) break; } } - + if (so->so_state & SS_CANTSENDMORE) { error = EPIPE; break; @@ -348,7 +348,7 @@ unp_attach(so) register struct mbuf *m; register struct unpcb *unp; int error; - + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { switch (so->so_type) { @@ -379,7 +379,7 @@ void unp_detach(unp) register struct unpcb *unp; { - + if (unp->unp_vnode) { unp->unp_vnode->v_socket = 0; vrele(unp->unp_vnode); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index f3f652834f6f..e7ac981c3e00 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.44 1995/05/11 19:26:29 rgrimes Exp $ + * $Id: vfs_bio.c,v 1.45 1995/05/21 21:38:49 davidg Exp $ */ /* @@ -399,7 +399,7 @@ brelse(struct buf * bp) if (((bp->b_flags & B_VMIO) == 0) && bp->b_vp) brelvp(bp); } - + /* * VMIO buffer rundown. It is not very necessary to keep a VMIO buffer * constituted, so the B_INVAL flag is used to *invalidate* the buffer, @@ -449,7 +449,7 @@ brelse(struct buf * bp) vm_page_test_dirty(m); if (m->dirty == 0) { vm_page_set_invalid(m, foff, resid); - if (m->valid == 0) + if (m->valid == 0) vm_page_protect(m, VM_PROT_NONE); } } @@ -825,7 +825,7 @@ loop: bp->b_flags |= B_WANTED; if (!tsleep((caddr_t) bp, PRIBIO | slpflag, "getblk", slptimeo)) goto loop; - + splx(s); return (struct buf *) NULL; } @@ -861,7 +861,7 @@ loop: /* * This code is used to make sure that a buffer is not - * created while the getnewbuf routine is blocked. + * created while the getnewbuf routine is blocked. * Normally the vnode is locked so this isn't a problem. * VBLK type I/O requests, however, don't lock the vnode. * VOP_ISLOCKED would be much better but is also much @@ -1431,7 +1431,7 @@ vfs_bio_clrbuf(struct buf *bp) { } bp->b_resid = 0; return; - } + } for(i=0;ib_npages;i++) { if( bp->b_pages[i]->valid == VM_PAGE_BITS_ALL) continue; @@ -1440,7 +1440,7 @@ vfs_bio_clrbuf(struct buf *bp) { } else { int j; for(j=0;jb_pages[i]->valid & (1<b_pages[i]->valid & (1<b_data + i * PAGE_SIZE + j * DEV_BSIZE, DEV_BSIZE); } } diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index e8f1b1691cb0..a05b4a0d2ca3 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cache.c 8.3 (Berkeley) 8/22/94 - * $Id: vfs_cache.c,v 1.13 1995/04/04 02:01:13 davidg Exp $ + * $Id: vfs_cache.c,v 1.14 1995/04/15 00:49:35 davidg Exp $ */ #include @@ -99,15 +99,15 @@ u_long nchnbr; NCHNBR(ncp); } } /* - * Lookup an entry in the cache + * Lookup an entry in the cache * - * We don't do this if the segment name is long, simply so the cache + * We don't do this if the segment name is long, simply so the cache * can avoid holding long names (which would either waste space, or * add greatly to the complexity). * * Lookup is called with dvp pointing to the directory to search, * cnp pointing to the name of the entry being sought. - * If the lookup succeeds, the vnode is returned in *vpp, and a status + * If the lookup succeeds, the vnode is returned in *vpp, and a status * of -1 is returned. * If the lookup determines that the name does not exist (negative cacheing), * a status of ENOENT is returned. @@ -161,7 +161,7 @@ cache_lookup(dvp, vpp, cnp) nchstats.ncs_badhits++; PURGE(ncp); return (0); - } + } /* We found a "positive" match, return the vnode */ if (ncp->nc_vp != &nchENOENT) { @@ -254,7 +254,7 @@ nchinit() /* * Invalidate a all entries to particular vnode. - * + * * We actually just increment the v_id, that will do it. The entries will * be purged by lookup as they get found. * If the v_id wraps around, we need to ditch the entire cache, to avoid diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 04d803d24081..89a0c1b9c74e 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.14 1995/03/19 13:28:54 davidg Exp $ + * $Id: vfs_cluster.c,v 1.15 1995/04/04 02:10:17 davidg Exp $ */ #include @@ -140,7 +140,7 @@ cluster_read(vp, filesize, lblkno, size, cred, bpp) if ( vp->v_maxra >= (origlblkno + vp->v_ralen)) return 0; lblkno = vp->v_maxra; - } + } bp = NULL; } else { /* @@ -422,7 +422,7 @@ cluster_write(bp, filesize) if (vp->v_clen != 0) { /* * Next block is not sequential. - * + * * If we are not writing at end of file, the process * seeked to another point in the file since its last * write, or we have reached our maximum cluster size, diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 508e23f4d529..ad1272142241 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $Id: vfs_init.c,v 1.8 1994/10/08 22:33:42 phk Exp $ + * $Id: vfs_init.c,v 1.9 1994/10/20 00:48:28 wollman Exp $ */ @@ -189,7 +189,7 @@ vfs_opv_init(struct vnodeopv_desc **them) } for (k = 0; k @@ -229,7 +229,7 @@ namei(ndp) * the target is returned locked, otherwise it is returned unlocked. * When creating or renaming and LOCKPARENT is specified, the target may not * be ".". When deleting and LOCKPARENT is specified, the target may be ".". - * + * * Overall outline of lookup: * * dirloop: @@ -645,7 +645,7 @@ relookup(dvp, vpp, cnp) /* ASSERT(dvp == ndp->ni_startdir) */ if (cnp->cn_flags & SAVESTART) VREF(dvp); - + if (!wantparent) vrele(dvp); if ((cnp->cn_flags & LOCKLEAF) == 0) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 187ff3b56550..bdd88d53938f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $Id: vfs_vnops.c,v 1.9 1995/03/19 12:08:03 davidg Exp $ + * $Id: vfs_vnops.c,v 1.10 1995/05/10 18:59:11 davidg Exp $ */ #include @@ -89,7 +89,7 @@ vn_open(ndp, fmode, cmode) LEASE_CHECK(ndp->ni_dvp, p, cred, LEASE_WRITE); error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, vap); - if (error) + if (error) return (error); fmode &= ~O_TRUNC; vp = ndp->ni_vp; -- cgit v1.2.3