diff options
| author | truckman <truckman@FreeBSD.org> | 1998-11-11 10:56:07 +0000 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 1998-11-11 10:56:07 +0000 |
| commit | d869e3568091433f9d3beb11c9f29c4fdd08f39a (patch) | |
| tree | 18bf440741743ec4f31ffe9110554bf83aa39ddb /sys/kern | |
| parent | de184682fa22833c7b18a96a136bc031ae786434 (diff) | |
| download | FreeBSD-src-d869e3568091433f9d3beb11c9f29c4fdd08f39a.zip FreeBSD-src-d869e3568091433f9d3beb11c9f29c4fdd08f39a.tar.gz | |
I got another batch of suggestions for cosmetic changes from bde.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_descrip.c | 11 | ||||
| -rw-r--r-- | sys/kern/kern_proc.c | 4 | ||||
| -rw-r--r-- | sys/kern/subr_log.c | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index d2ef3e1..8fc26b2 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.55 1998/07/29 17:38:13 bde Exp $ + * $Id: kern_descrip.c,v 1.56 1998/11/11 10:03:54 truckman Exp $ */ #include "opt_compat.h" @@ -398,15 +398,16 @@ fsetown(pgid, sigiop) pid_t pgid; struct sigio **sigiop; { - struct proc *proc = NULL; - struct pgrp *pgrp = NULL; + struct proc *proc; + struct pgrp *pgrp; struct sigio *sigio; int s; if (pgid == 0) { funsetown(*sigiop); return (0); - } else if (pgid > 0) { + } + if (pgid > 0) { proc = pfind(pgid); if (proc == NULL) return (ESRCH); @@ -420,6 +421,7 @@ fsetown(pgid, sigiop) */ else if (proc->p_session != curproc->p_session) return (EPERM); + pgrp = NULL; } else /* if (pgid < 0) */ { pgrp = pgfind(-pgid); if (pgrp == NULL) @@ -434,6 +436,7 @@ fsetown(pgid, sigiop) */ else if (pgrp->pg_session != curproc->p_session) return (EPERM); + proc = NULL; } funsetown(*sigiop); MALLOC(sigio, struct sigio *, sizeof(struct sigio), M_SIGIO, diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index a517358..9f046a3 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $Id: kern_proc.c,v 1.38 1998/11/09 15:07:41 truckman Exp $ + * $Id: kern_proc.c,v 1.39 1998/11/11 10:03:55 truckman Exp $ */ #include <sys/param.h> @@ -40,6 +40,7 @@ #include <sys/sysctl.h> #include <sys/proc.h> #include <sys/malloc.h> +#include <sys/filedesc.h> #include <sys/tty.h> #include <sys/signalvar.h> #include <vm/vm.h> @@ -48,7 +49,6 @@ #include <vm/vm_map.h> #include <sys/user.h> #include <vm/vm_zone.h> -#include <sys/filedesc.h> static MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); MALLOC_DEFINE(M_SESSION, "session", "session header"); diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 01d8c4e..e6d9b34 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.30 1998/06/07 17:11:38 dfr Exp $ + * $Id: subr_log.c,v 1.31 1998/11/11 10:03:55 truckman Exp $ */ /* @@ -76,7 +76,7 @@ static struct cdevsw log_cdevsw = static struct logsoftc { int sc_state; /* see above for possibilities */ struct selinfo sc_selp; /* process waiting on select call */ - struct sigio *sc_sigio; /* information for SIGIO */ + struct sigio *sc_sigio; /* information for async I/O */ } logsoftc; int log_open; /* also used in log() */ |
