A Major staticize sweep. Generates a couple of warnings that I'll deal
with later. A number of unused vars removed. A number of unused procs removed or #ifdefed.
This commit is contained in:
Poul-Henning Kamp
parent
e531deaeb2
commit
87b6de2b76
@ -38,7 +38,7 @@
|
||||
*
|
||||
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
|
||||
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
|
||||
* $Id: vm_machdep.c,v 1.47 1995/12/10 13:36:34 phk Exp $
|
||||
* $Id: vm_machdep.c,v 1.48 1995/12/11 04:55:01 dyson Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -67,8 +67,6 @@
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
|
||||
extern void pagemove __P((caddr_t from, caddr_t to, int size));
|
||||
static void setredzone __P((u_short *pte, caddr_t vaddr));
|
||||
static void vm_fault_quick __P((caddr_t v, int prot));
|
||||
|
||||
#ifdef BOUNCE_BUFFERS
|
||||
@ -80,7 +78,7 @@ static vm_offset_t
|
||||
vm_bounce_page_find __P((int count));
|
||||
static void vm_bounce_page_free __P((vm_offset_t pa, int count));
|
||||
|
||||
static static volatile int kvasfreecnt;
|
||||
static volatile int kvasfreecnt;
|
||||
|
||||
caddr_t bouncememory;
|
||||
int bouncepages;
|
||||
@ -639,9 +637,7 @@ cpu_coredump(p, vp, cred)
|
||||
p));
|
||||
}
|
||||
|
||||
/*
|
||||
* Set a red zone in the kernel stack after the u. area.
|
||||
*/
|
||||
#ifdef notyet
|
||||
static void
|
||||
setredzone(pte, vaddr)
|
||||
u_short *pte;
|
||||
@ -656,35 +652,7 @@ setredzone(pte, vaddr)
|
||||
used by sched (that has physical memory mapped 1:1 at bottom)
|
||||
and take the dump while still in mapped mode */
|
||||
}
|
||||
|
||||
/*
|
||||
* Move pages from one kernel virtual address to another.
|
||||
* Both addresses are assumed to reside in the Sysmap,
|
||||
* and size must be a multiple of CLSIZE.
|
||||
*/
|
||||
|
||||
static void
|
||||
pagemove(from, to, size)
|
||||
register caddr_t from, to;
|
||||
int size;
|
||||
{
|
||||
register vm_offset_t pa;
|
||||
|
||||
if (size & CLOFSET)
|
||||
panic("pagemove");
|
||||
while (size > 0) {
|
||||
pa = pmap_kextract((vm_offset_t)from);
|
||||
if (pa == 0)
|
||||
panic("pagemove 2");
|
||||
if (pmap_kextract((vm_offset_t)to) != 0)
|
||||
panic("pagemove 3");
|
||||
pmap_kremove((vm_offset_t)from);
|
||||
pmap_kenter((vm_offset_t)to, pa);
|
||||
from += PAGE_SIZE;
|
||||
to += PAGE_SIZE;
|
||||
size -= PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Convert kernel VA to physical address
|
||||
|
||||
@ -22,9 +22,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/ioctl_compat.h> /* Oooh..We need O/NTTYDISC */
|
||||
#include <sys/proc.h>
|
||||
#define TTYDEFCHARS
|
||||
#include <sys/tty.h>
|
||||
#undef TTYDEFCHARS
|
||||
#include <sys/file.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/uio.h>
|
||||
@ -57,6 +55,7 @@ static struct cdevsw snp_cdevsw =
|
||||
static struct snoop snoopsw[NSNP];
|
||||
|
||||
static struct tty *devtotty __P((dev_t dev));
|
||||
static int snp_detach __P((struct snoop *snp));
|
||||
|
||||
static struct tty *
|
||||
devtotty (dev)
|
||||
@ -320,7 +319,7 @@ snpopen(dev, flag, mode, p)
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
static int
|
||||
snp_detach(snp)
|
||||
struct snoop *snp;
|
||||
{
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
*
|
||||
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
|
||||
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
|
||||
* $Id: vm_machdep.c,v 1.47 1995/12/10 13:36:34 phk Exp $
|
||||
* $Id: vm_machdep.c,v 1.48 1995/12/11 04:55:01 dyson Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -67,8 +67,6 @@
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
|
||||
extern void pagemove __P((caddr_t from, caddr_t to, int size));
|
||||
static void setredzone __P((u_short *pte, caddr_t vaddr));
|
||||
static void vm_fault_quick __P((caddr_t v, int prot));
|
||||
|
||||
#ifdef BOUNCE_BUFFERS
|
||||
@ -80,7 +78,7 @@ static vm_offset_t
|
||||
vm_bounce_page_find __P((int count));
|
||||
static void vm_bounce_page_free __P((vm_offset_t pa, int count));
|
||||
|
||||
static static volatile int kvasfreecnt;
|
||||
static volatile int kvasfreecnt;
|
||||
|
||||
caddr_t bouncememory;
|
||||
int bouncepages;
|
||||
@ -639,9 +637,7 @@ cpu_coredump(p, vp, cred)
|
||||
p));
|
||||
}
|
||||
|
||||
/*
|
||||
* Set a red zone in the kernel stack after the u. area.
|
||||
*/
|
||||
#ifdef notyet
|
||||
static void
|
||||
setredzone(pte, vaddr)
|
||||
u_short *pte;
|
||||
@ -656,35 +652,7 @@ setredzone(pte, vaddr)
|
||||
used by sched (that has physical memory mapped 1:1 at bottom)
|
||||
and take the dump while still in mapped mode */
|
||||
}
|
||||
|
||||
/*
|
||||
* Move pages from one kernel virtual address to another.
|
||||
* Both addresses are assumed to reside in the Sysmap,
|
||||
* and size must be a multiple of CLSIZE.
|
||||
*/
|
||||
|
||||
static void
|
||||
pagemove(from, to, size)
|
||||
register caddr_t from, to;
|
||||
int size;
|
||||
{
|
||||
register vm_offset_t pa;
|
||||
|
||||
if (size & CLOFSET)
|
||||
panic("pagemove");
|
||||
while (size > 0) {
|
||||
pa = pmap_kextract((vm_offset_t)from);
|
||||
if (pa == 0)
|
||||
panic("pagemove 2");
|
||||
if (pmap_kextract((vm_offset_t)to) != 0)
|
||||
panic("pagemove 3");
|
||||
pmap_kremove((vm_offset_t)from);
|
||||
pmap_kenter((vm_offset_t)to, pa);
|
||||
from += PAGE_SIZE;
|
||||
to += PAGE_SIZE;
|
||||
size -= PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Convert kernel VA to physical address
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_acct.c 8.1 (Berkeley) 6/14/93
|
||||
* $Id: kern_acct.c,v 1.8 1995/10/29 15:30:56 phk Exp $
|
||||
* $Id: kern_acct.c,v 1.9 1995/11/12 06:42:51 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -49,6 +49,7 @@
|
||||
#include <sys/file.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/namei.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/acct.h>
|
||||
@ -72,21 +73,29 @@
|
||||
* The former's operation is described in Leffler, et al., and the latter
|
||||
* was provided by UCB with the 4.4BSD-Lite release
|
||||
*/
|
||||
comp_t encode_comp_t __P((u_long, u_long));
|
||||
void acctwatch __P((void *));
|
||||
static comp_t encode_comp_t __P((u_long, u_long));
|
||||
static void acctwatch __P((void *));
|
||||
|
||||
/*
|
||||
* Accounting vnode pointer, and saved vnode pointer.
|
||||
*/
|
||||
struct vnode *acctp;
|
||||
struct vnode *savacctp;
|
||||
static struct vnode *acctp;
|
||||
static struct vnode *savacctp;
|
||||
|
||||
/*
|
||||
* Values associated with enabling and disabling accounting
|
||||
*/
|
||||
int acctsuspend = 2; /* stop accounting when < 2% free space left */
|
||||
int acctresume = 4; /* resume when free space risen to > 4% */
|
||||
int acctchkfreq = 15; /* frequency (in seconds) to check space */
|
||||
static int acctsuspend = 2; /* stop accounting when < 2% free space left */
|
||||
SYSCTL_INT(_kern, OID_AUTO, acct_suspend, CTLFLAG_RW,
|
||||
&acctsuspend, 0, "");
|
||||
|
||||
static int acctresume = 4; /* resume when free space risen to > 4% */
|
||||
SYSCTL_INT(_kern, OID_AUTO, acct_resume, CTLFLAG_RW,
|
||||
&acctresume, 0, "");
|
||||
|
||||
static int acctchkfreq = 15; /* frequency (in seconds) to check space */
|
||||
SYSCTL_INT(_kern, OID_AUTO, acct_chkfreq, CTLFLAG_RW,
|
||||
&acctchkfreq, 0, "");
|
||||
|
||||
/*
|
||||
* Accounting system call. Written based on the specification and
|
||||
@ -235,7 +244,7 @@ acct_process(p)
|
||||
#define EXPSIZE 3 /* Base 8 (3 bit) exponent. */
|
||||
#define MAXFRACT ((1 << MANTSIZE) - 1) /* Maximum fractional value. */
|
||||
|
||||
comp_t
|
||||
static comp_t
|
||||
encode_comp_t(s, us)
|
||||
u_long s, us;
|
||||
{
|
||||
@ -271,7 +280,7 @@ encode_comp_t(s, us)
|
||||
* system containing the accounting file has been forcibly unmounted.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
void
|
||||
static void
|
||||
acctwatch(a)
|
||||
void *a;
|
||||
{
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94
|
||||
* $Id: kern_descrip.c,v 1.21 1995/12/08 11:16:59 julian Exp $
|
||||
* $Id: kern_descrip.c,v 1.22 1995/12/08 23:21:31 phk Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -75,7 +75,7 @@ static struct cdevsw fildesc_cdevsw =
|
||||
noioc, nostop, nullreset, nodevtotty,/*fd(!=Fd)*/
|
||||
noselect, nommap, nostrat };
|
||||
|
||||
int finishdup(struct filedesc *fdp, int old, int new, int *retval);
|
||||
static int finishdup(struct filedesc *fdp, int old, int new, int *retval);
|
||||
/*
|
||||
* Descriptor management.
|
||||
*/
|
||||
@ -336,7 +336,7 @@ fcntl(p, uap, retval)
|
||||
/*
|
||||
* Common code for dup, dup2, and fcntl(F_DUPFD).
|
||||
*/
|
||||
int
|
||||
static int
|
||||
finishdup(fdp, old, new, retval)
|
||||
register struct filedesc *fdp;
|
||||
register int old, new, *retval;
|
||||
@ -522,7 +522,8 @@ fpathconf(p, uap, retval)
|
||||
/*
|
||||
* Allocate a file descriptor for the process.
|
||||
*/
|
||||
int fdexpand;
|
||||
static int fdexpand;
|
||||
SYSCTL_INT(_debug, OID_AUTO, fdexpand, CTLFLAG_RD, &fdexpand, 0, "");
|
||||
|
||||
int
|
||||
fdalloc(p, want, result)
|
||||
|
||||
@ -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.11 1995/11/20 12:42:01 phk Exp $
|
||||
* $Id: kern_devconf.c,v 1.12 1995/12/06 23:37:06 bde Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -38,7 +38,7 @@
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/devconf.h>
|
||||
|
||||
struct kern_devconf *dc_list = 0;
|
||||
static struct kern_devconf *dc_list = 0;
|
||||
static unsigned dc_lastnum = 0;
|
||||
|
||||
int
|
||||
|
||||
@ -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.28 1995/12/07 12:46:40 davidg Exp $
|
||||
* $Id: kern_exec.c,v 1.29 1995/12/09 04:29:11 peter Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -59,7 +59,7 @@
|
||||
|
||||
#include <machine/reg.h>
|
||||
|
||||
int *exec_copyout_strings __P((struct image_params *));
|
||||
static int *exec_copyout_strings __P((struct image_params *));
|
||||
|
||||
static int exec_check_permissions(struct image_params *);
|
||||
|
||||
@ -67,7 +67,8 @@ static int exec_check_permissions(struct image_params *);
|
||||
* execsw_set is constructed for us by the linker. Each of the items
|
||||
* is a pointer to a `const struct execsw', hence the double pointer here.
|
||||
*/
|
||||
const struct execsw **execsw = (const struct execsw **)&execsw_set.ls_items[0];
|
||||
static const struct execsw **execsw =
|
||||
(const struct execsw **)&execsw_set.ls_items[0];
|
||||
|
||||
#ifndef _SYS_SYSPROTO_H_
|
||||
struct execve_args {
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93
|
||||
* $Id: kern_ktrace.c,v 1.7 1995/11/12 06:42:56 bde Exp $
|
||||
* $Id: kern_ktrace.c,v 1.8 1995/12/02 18:58:47 bde Exp $
|
||||
*/
|
||||
|
||||
#ifdef KTRACE
|
||||
@ -47,9 +47,14 @@
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/syslog.h>
|
||||
|
||||
extern struct ktr_header *ktrgetheader __P((int type));
|
||||
static struct ktr_header *ktrgetheader __P((int type));
|
||||
static void ktrwrite __P((struct vnode *, struct ktr_header *));
|
||||
static int ktrcanset __P((struct proc *,struct proc *));
|
||||
static int ktrsetchildren __P((struct proc *,struct proc *,int,int,struct vnode *));
|
||||
static int ktrops __P((struct proc *,struct proc *,int,int,struct vnode *));
|
||||
|
||||
struct ktr_header *
|
||||
|
||||
static struct ktr_header *
|
||||
ktrgetheader(type)
|
||||
int type;
|
||||
{
|
||||
@ -335,7 +340,7 @@ done:
|
||||
return (error);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
ktrops(curp, p, ops, facs, vp)
|
||||
struct proc *p, *curp;
|
||||
int ops, facs;
|
||||
@ -372,7 +377,7 @@ ktrops(curp, p, ops, facs, vp)
|
||||
return (1);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
ktrsetchildren(curp, top, ops, facs, vp)
|
||||
struct proc *curp, *top;
|
||||
int ops, facs;
|
||||
@ -408,7 +413,7 @@ ktrsetchildren(curp, top, ops, facs, vp)
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
ktrwrite(vp, kth)
|
||||
struct vnode *vp;
|
||||
register struct ktr_header *kth;
|
||||
@ -463,7 +468,7 @@ ktrwrite(vp, kth)
|
||||
*
|
||||
* TODO: check groups. use caller effective gid.
|
||||
*/
|
||||
int
|
||||
static int
|
||||
ktrcanset(callp, targetp)
|
||||
struct proc *callp, *targetp;
|
||||
{
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94
|
||||
* $Id: kern_lockf.c,v 1.3 1994/10/25 11:27:51 davidg Exp $
|
||||
* $Id: kern_lockf.c,v 1.4 1995/05/30 08:05:31 rgrimes Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -61,6 +61,16 @@ int lockf_debug = 0;
|
||||
#define NOLOCKF (struct lockf *)0
|
||||
#define SELF 0x1
|
||||
#define OTHERS 0x2
|
||||
static void lf_addblock __P((struct lockf *, struct lockf *));
|
||||
static int lf_clearlock __P((struct lockf *));
|
||||
static int lf_findoverlap __P((struct lockf *,
|
||||
struct lockf *, int, struct lockf ***, struct lockf **));
|
||||
static struct lockf *
|
||||
lf_getblock __P((struct lockf *));
|
||||
static int lf_getlock __P((struct lockf *, struct flock *));
|
||||
static int lf_setlock __P((struct lockf *));
|
||||
static void lf_split __P((struct lockf *, struct lockf *));
|
||||
static void lf_wakelock __P((struct lockf *));
|
||||
|
||||
/*
|
||||
* Advisory record locking support
|
||||
@ -157,7 +167,7 @@ lf_advlock(ap, head, size)
|
||||
/*
|
||||
* Set a byte-range lock.
|
||||
*/
|
||||
int
|
||||
static int
|
||||
lf_setlock(lock)
|
||||
register struct lockf *lock;
|
||||
{
|
||||
@ -399,7 +409,7 @@ lf_setlock(lock)
|
||||
* Generally, find the lock (or an overlap to that lock)
|
||||
* and remove it (or shrink it), then wakeup anyone we can.
|
||||
*/
|
||||
int
|
||||
static int
|
||||
lf_clearlock(unlock)
|
||||
register struct lockf *unlock;
|
||||
{
|
||||
@ -468,7 +478,7 @@ lf_clearlock(unlock)
|
||||
* Check whether there is a blocking lock,
|
||||
* and if so return its process identifier.
|
||||
*/
|
||||
int
|
||||
static int
|
||||
lf_getlock(lock, fl)
|
||||
register struct lockf *lock;
|
||||
register struct flock *fl;
|
||||
@ -502,7 +512,7 @@ lf_getlock(lock, fl)
|
||||
* Walk the list of locks for an inode and
|
||||
* return the first blocking lock.
|
||||
*/
|
||||
struct lockf *
|
||||
static struct lockf *
|
||||
lf_getblock(lock)
|
||||
register struct lockf *lock;
|
||||
{
|
||||
@ -532,7 +542,7 @@ lf_getblock(lock)
|
||||
* NOTE: this returns only the FIRST overlapping lock. There
|
||||
* may be more than one.
|
||||
*/
|
||||
int
|
||||
static int
|
||||
lf_findoverlap(lf, lock, type, prev, overlap)
|
||||
register struct lockf *lf;
|
||||
struct lockf *lock;
|
||||
@ -641,7 +651,7 @@ lf_findoverlap(lf, lock, type, prev, overlap)
|
||||
/*
|
||||
* Add a lock to the end of the blocked list.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
lf_addblock(blocklist, lock)
|
||||
struct lockf *blocklist;
|
||||
struct lockf *lock;
|
||||
@ -670,7 +680,7 @@ lf_addblock(blocklist, lock)
|
||||
* Split a lock and a contained region into
|
||||
* two or three locks as necessary.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
lf_split(lock1, lock2)
|
||||
register struct lockf *lock1;
|
||||
register struct lockf *lock2;
|
||||
@ -717,7 +727,7 @@ lf_split(lock1, lock2)
|
||||
/*
|
||||
* Wakeup a blocklist
|
||||
*/
|
||||
void
|
||||
static void
|
||||
lf_wakelock(listhead)
|
||||
struct lockf *listhead;
|
||||
{
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94
|
||||
* $Id: kern_malloc.c,v 1.15 1995/12/02 17:10:34 bde Exp $
|
||||
* $Id: kern_malloc.c,v 1.16 1995/12/07 12:46:44 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -49,7 +49,7 @@
|
||||
static void kmeminit __P((void *));
|
||||
SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL)
|
||||
|
||||
struct kmembuckets bucket[MINBUCKET + 16];
|
||||
static struct kmembuckets bucket[MINBUCKET + 16];
|
||||
struct kmemstats kmemstats[M_LAST];
|
||||
struct kmemusage *kmemusage;
|
||||
char *kmembase, *kmemlimit;
|
||||
@ -59,7 +59,7 @@ char *memname[] = INITKMEMNAMES;
|
||||
/*
|
||||
* This structure provides a set of masks to catch unaligned frees.
|
||||
*/
|
||||
long addrmask[] = { 0,
|
||||
static long addrmask[] = { 0,
|
||||
0x00000001, 0x00000003, 0x00000007, 0x0000000f,
|
||||
0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff,
|
||||
0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff,
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_proc.c 8.4 (Berkeley) 1/4/94
|
||||
* $Id: kern_proc.c,v 1.12 1995/12/02 18:58:49 bde Exp $
|
||||
* $Id: kern_proc.c,v 1.13 1995/12/07 12:46:47 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -65,18 +65,18 @@ struct prochd idqs[NQS]; /* Space for IDLE queues too */
|
||||
volatile struct proc *allproc; /* all processes */
|
||||
struct proc *zombproc; /* just zombies */
|
||||
|
||||
void pgdelete __P((struct pgrp *));
|
||||
static void pgdelete __P((struct pgrp *));
|
||||
|
||||
/*
|
||||
* Structure associated with user cacheing.
|
||||
*/
|
||||
struct uidinfo {
|
||||
static struct uidinfo {
|
||||
struct uidinfo *ui_next;
|
||||
struct uidinfo **ui_prev;
|
||||
uid_t ui_uid;
|
||||
long ui_proccnt;
|
||||
} **uihashtbl;
|
||||
u_long uihash; /* size of hash table - 1 */
|
||||
static u_long uihash; /* size of hash table - 1 */
|
||||
#define UIHASH(uid) ((uid) & uihash)
|
||||
|
||||
static void orphanpg __P((struct pgrp *pg));
|
||||
@ -307,7 +307,7 @@ leavepgrp(p)
|
||||
/*
|
||||
* delete a process group
|
||||
*/
|
||||
void
|
||||
static void
|
||||
pgdelete(pgrp)
|
||||
register struct pgrp *pgrp;
|
||||
{
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_sig.c 8.7 (Berkeley) 4/18/94
|
||||
* $Id: kern_sig.c,v 1.14 1995/11/18 10:01:38 bde Exp $
|
||||
* $Id: kern_sig.c,v 1.15 1995/12/07 12:46:49 davidg Exp $
|
||||
*/
|
||||
|
||||
#define SIGPROP /* include signal properties table */
|
||||
@ -69,9 +69,11 @@
|
||||
#include <vm/vm_map.h>
|
||||
#include <sys/user.h> /* for coredump */
|
||||
|
||||
extern int killpg1 __P((struct proc *cp, int signum, int pgid, int all));
|
||||
extern void killproc __P((struct proc *p, char *why));
|
||||
extern void stop __P((struct proc *));
|
||||
static int coredump __P((struct proc *p));
|
||||
static int killpg1 __P((struct proc *cp, int signum, int pgid, int all));
|
||||
/* XXX killproc may be a supported interface, but it isn't used anywhere... */
|
||||
static void killproc __P((struct proc *p, char *why));
|
||||
static void stop __P((struct proc *));
|
||||
|
||||
/*
|
||||
* Can process p, with pcred pc, send the signal signum to process q?
|
||||
@ -1188,7 +1190,7 @@ sigexit(p, signum)
|
||||
* Dump core, into a file named "progname.core", unless the process was
|
||||
* setuid/setgid.
|
||||
*/
|
||||
int
|
||||
static int
|
||||
coredump(p)
|
||||
register struct proc *p;
|
||||
{
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94
|
||||
* $Id: kern_sysctl.c,v 1.55 1995/12/06 13:27:38 phk Exp $
|
||||
* $Id: kern_sysctl.c,v 1.56 1995/12/07 12:46:52 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -957,7 +957,7 @@ userland_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *old
|
||||
* limited kernel stack... -Peter
|
||||
*/
|
||||
|
||||
struct {
|
||||
static struct {
|
||||
int bsdi_machine; /* "i386" on BSD/386 */
|
||||
/* ^^^ this is an offset to the string, relative to the struct start */
|
||||
char *pad0;
|
||||
@ -994,7 +994,7 @@ struct {
|
||||
* This contains "FreeBSD\02.0-BUILT-nnnnnn\0i386\0", and these strings
|
||||
* should not exceed the length of the buffer here... (or else!! :-)
|
||||
*/
|
||||
char bsdi_strings[80]; /* It had better be less than this! */
|
||||
static char bsdi_strings[80]; /* It had better be less than this! */
|
||||
|
||||
#ifndef _SYS_SYSPROTO_H_
|
||||
struct getkerninfo_args {
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_time.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: kern_time.c,v 1.11 1995/11/12 06:43:02 bde Exp $
|
||||
* $Id: kern_time.c,v 1.12 1995/11/19 00:59:22 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -136,7 +136,7 @@ settimeofday(p, uap, retval)
|
||||
extern int tickadj; /* "standard" clock skew, us./tick */
|
||||
int tickdelta; /* current clock skew, us. per tick */
|
||||
long timedelta; /* unapplied time correction, us. */
|
||||
long bigadj = 1000000; /* use 10x skew above bigadj us. */
|
||||
static long bigadj = 1000000; /* use 10x skew above bigadj us. */
|
||||
|
||||
#ifndef _SYS_SYSPROTO_H_
|
||||
struct adjtime_args {
|
||||
@ -431,7 +431,7 @@ timevalsub(t1, t2)
|
||||
timevalfix(t1);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
timevalfix(t1)
|
||||
struct timeval *t1;
|
||||
{
|
||||
|
||||
@ -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.17 1995/11/02 08:37:22 peter Exp $
|
||||
* $Id: tty_subr.c,v 1.18 1995/11/20 12:15:45 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -24,7 +24,7 @@
|
||||
static void clist_init __P((void *));
|
||||
SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL)
|
||||
|
||||
struct cblock *cfreelist = 0;
|
||||
static struct cblock *cfreelist = 0;
|
||||
int cfreecount = 0;
|
||||
static int cslushcount;
|
||||
static int ctotcount;
|
||||
@ -39,10 +39,10 @@ static void cblock_free __P((struct cblock *cblockp));
|
||||
static void cblock_free_cblocks __P((int number));
|
||||
|
||||
#ifdef DDB
|
||||
static void cbstat __P((void));
|
||||
void DDB_cbstat __P((void));
|
||||
|
||||
static void
|
||||
cbstat()
|
||||
DDB_cbstat()
|
||||
{
|
||||
printf(
|
||||
"tot = %d (active = %d, free = %d (reserved = %d, slush = %d))\n",
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)subr_log.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: subr_log.c,v 1.14 1995/12/08 11:17:06 julian Exp $
|
||||
* $Id: subr_log.c,v 1.15 1995/12/08 23:21:33 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -69,7 +69,7 @@ static struct cdevsw log_cdevsw =
|
||||
logioctl, nostop, nullreset, nodevtotty,/* klog */
|
||||
logselect, nommap, NULL, "log", NULL, -1 };
|
||||
|
||||
struct logsoftc {
|
||||
static struct logsoftc {
|
||||
int sc_state; /* see above for possibilities */
|
||||
struct selinfo sc_selp; /* process waiting on select call */
|
||||
int sc_pgid; /* process/group for async I/O */
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
|
||||
* $Id: subr_prf.c,v 1.17 1995/08/07 08:40:49 davidg Exp $
|
||||
* $Id: subr_prf.c,v 1.18 1995/08/24 12:54:11 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -68,13 +68,13 @@
|
||||
|
||||
struct tty *constty; /* pointer to console "window" tty */
|
||||
|
||||
void (*v_putc)(int) = cnputc; /* routine to putc on virtual console */
|
||||
static void (*v_putc)(int) = cnputc; /* routine to putc on virtual console */
|
||||
|
||||
void logpri __P((int level));
|
||||
static void logpri __P((int level));
|
||||
static void putchar __P((int ch, int flags, struct tty *tp));
|
||||
static char *ksprintn __P((u_long num, int base, int *len));
|
||||
|
||||
int consintr = 1; /* Ok to handle console interrupts? */
|
||||
static int consintr = 1; /* Ok to handle console interrupts? */
|
||||
|
||||
/*
|
||||
* Variable panicstr contains argument to first call to panic; used as flag
|
||||
@ -262,7 +262,7 @@ log(level, fmt, va_alist)
|
||||
logwakeup();
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
logpri(level)
|
||||
int level;
|
||||
{
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)subr_prof.c 8.3 (Berkeley) 9/23/93
|
||||
* $Id: subr_prof.c,v 1.12 1995/12/02 17:10:37 bde Exp $
|
||||
* $Id: subr_prof.c,v 1.13 1995/12/06 23:37:15 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -235,7 +235,7 @@ addupc_intr(p, pc, ticks)
|
||||
* Much like before, but we can afford to take faults here. If the
|
||||
* update fails, we simply turn off profiling.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
addupc_task(p, pc, ticks)
|
||||
register struct proc *p;
|
||||
register u_long pc;
|
||||
|
||||
@ -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.13 1995/12/07 12:46:53 davidg Exp $
|
||||
* $Id: subr_rlist.c,v 1.14 1995/12/11 04:56:02 dyson Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -74,7 +74,7 @@
|
||||
#define RLIST_MIN 128
|
||||
static int rlist_count=0, rlist_desired=0;
|
||||
static struct rlist *rlfree;
|
||||
int rlist_active;
|
||||
static int rlist_active;
|
||||
|
||||
static struct rlist *rlist_malloc __P((void));
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)sys_generic.c 8.5 (Berkeley) 1/21/94
|
||||
* $Id: sys_generic.c,v 1.15 1995/11/11 06:57:34 bde Exp $
|
||||
* $Id: sys_generic.c,v 1.16 1995/11/12 06:43:05 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -59,7 +59,7 @@
|
||||
#endif
|
||||
#include <vm/vm.h>
|
||||
|
||||
int selscan __P((struct proc *, fd_set *, fd_set *, int, int *));
|
||||
static int selscan __P((struct proc *, fd_set *, fd_set *, int, int *));
|
||||
|
||||
/*
|
||||
* Read system call.
|
||||
@ -506,7 +506,8 @@ ioctl(p, uap, retval)
|
||||
return (error);
|
||||
}
|
||||
|
||||
int selwait, nselcoll;
|
||||
static int nselcoll;
|
||||
int selwait;
|
||||
|
||||
/*
|
||||
* Select system call.
|
||||
@ -610,7 +611,7 @@ done:
|
||||
return (error);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
selscan(p, ibits, obits, nfd, retval)
|
||||
struct proc *p;
|
||||
fd_set *ibits, *obits;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)sys_socket.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: sys_socket.c,v 1.4 1994/10/02 17:35:25 phk Exp $
|
||||
* $Id: sys_socket.c,v 1.5 1995/05/30 08:05:59 rgrimes Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -49,11 +49,17 @@
|
||||
#include <net/if.h>
|
||||
#include <net/route.h>
|
||||
|
||||
static int soo_read __P((struct file *fp, struct uio *uio,
|
||||
struct ucred *cred));
|
||||
static int soo_write __P((struct file *fp, struct uio *uio,
|
||||
struct ucred *cred));
|
||||
static int soo_close __P((struct file *fp, struct proc *p));
|
||||
|
||||
struct fileops socketops =
|
||||
{ soo_read, soo_write, soo_ioctl, soo_select, soo_close };
|
||||
|
||||
/* ARGSUSED */
|
||||
int
|
||||
static int
|
||||
soo_read(fp, uio, cred)
|
||||
struct file *fp;
|
||||
struct uio *uio;
|
||||
@ -65,7 +71,7 @@ soo_read(fp, uio, cred)
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
int
|
||||
static int
|
||||
soo_write(fp, uio, cred)
|
||||
struct file *fp;
|
||||
struct uio *uio;
|
||||
@ -191,7 +197,7 @@ soo_stat(so, ub)
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
int
|
||||
static int
|
||||
soo_close(fp, p)
|
||||
struct file *fp;
|
||||
struct proc *p;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: sysv_msg.c,v 1.8 1995/09/09 18:10:06 davidg Exp $ */
|
||||
/* $Id: sysv_msg.c,v 1.9 1995/10/21 19:49:57 bde Exp $ */
|
||||
|
||||
/*
|
||||
* Implementation of SVID messages
|
||||
@ -44,14 +44,14 @@ static int msgrcv __P((struct proc *p, struct msgrcv_args *uap, int *retval));
|
||||
static void msg_freehdr __P((struct msg *msghdr));
|
||||
|
||||
/* XXX casting to (sy_call_t *) is bogus, as usual. */
|
||||
sy_call_t *msgcalls[] = {
|
||||
static sy_call_t *msgcalls[] = {
|
||||
(sy_call_t *)msgctl, (sy_call_t *)msgget,
|
||||
(sy_call_t *)msgsnd, (sy_call_t *)msgrcv
|
||||
};
|
||||
|
||||
int nfree_msgmaps; /* # of free map entries */
|
||||
short free_msgmaps; /* head of linked list of free map entries */
|
||||
struct msg *free_msghdrs; /* list of free msg headers */
|
||||
static int nfree_msgmaps; /* # of free map entries */
|
||||
static short free_msgmaps; /* head of linked list of free map entries */
|
||||
static struct msg *free_msghdrs; /* list of free msg headers */
|
||||
char *msgpool; /* MSGMAX byte long msg buffer pool */
|
||||
struct msgmap *msgmaps; /* MSGSEG msgmap structures */
|
||||
struct msg *msghdrs; /* MSGTQL msg headers */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: sysv_sem.c,v 1.9 1995/09/09 18:10:07 davidg Exp $ */
|
||||
/* $Id: sysv_sem.c,v 1.10 1995/10/21 19:49:59 bde Exp $ */
|
||||
|
||||
/*
|
||||
* Implementation of SVID semaphores
|
||||
@ -26,24 +26,26 @@ static int semget __P((struct proc *p, struct semget_args *uap, int *retval));
|
||||
struct semop_args;
|
||||
static int semop __P((struct proc *p, struct semop_args *uap, int *retval));
|
||||
struct semconfig_args;
|
||||
static int semconfig __P((struct proc *p, struct semconfig_args *uap, int *retval));
|
||||
static int semconfig __P((struct proc *p, struct semconfig_args *uap,
|
||||
int *retval));
|
||||
|
||||
struct sem_undo *semu_alloc __P((struct proc *p));
|
||||
int semundo_adjust __P((struct proc *p, struct sem_undo **supptr, int semid, int semnum, int adjval));
|
||||
void semundo_clear __P((int semid, int semnum));
|
||||
void semexit __P((struct proc *p));
|
||||
static struct sem_undo *semu_alloc __P((struct proc *p));
|
||||
static int semundo_adjust __P((struct proc *p, struct sem_undo **supptr,
|
||||
int semid, int semnum, int adjval));
|
||||
static void semundo_clear __P((int semid, int semnum));
|
||||
static void semexit __P((struct proc *p));
|
||||
|
||||
/* XXX casting to (sy_call_t *) is bogus, as usual. */
|
||||
sy_call_t *semcalls[] = {
|
||||
static sy_call_t *semcalls[] = {
|
||||
(sy_call_t *)semctl, (sy_call_t *)semget,
|
||||
(sy_call_t *)semop, (sy_call_t *)semconfig
|
||||
};
|
||||
|
||||
int semtot = 0;
|
||||
static int semtot = 0;
|
||||
struct semid_ds *sema; /* semaphore id pool */
|
||||
struct sem *sem; /* semaphore pool */
|
||||
struct map *semmap; /* semaphore allocation map */
|
||||
struct sem_undo *semu_list; /* list of active undo structures */
|
||||
static struct map *semmap; /* semaphore allocation map */
|
||||
static struct sem_undo *semu_list; /* list of active undo structures */
|
||||
int *semu; /* undo structure pool */
|
||||
|
||||
static struct proc *semlock_holder = NULL;
|
||||
@ -148,7 +150,7 @@ semconfig(p, uap, retval)
|
||||
* (returns ptr to structure or NULL if no more room)
|
||||
*/
|
||||
|
||||
struct sem_undo *
|
||||
static struct sem_undo *
|
||||
semu_alloc(p)
|
||||
struct proc *p;
|
||||
{
|
||||
@ -218,7 +220,7 @@ semu_alloc(p)
|
||||
* Adjust a particular entry for a particular proc
|
||||
*/
|
||||
|
||||
int
|
||||
static int
|
||||
semundo_adjust(p, supptr, semid, semnum, adjval)
|
||||
register struct proc *p;
|
||||
struct sem_undo **supptr;
|
||||
@ -285,7 +287,7 @@ semundo_adjust(p, supptr, semid, semnum, adjval)
|
||||
return(0);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
semundo_clear(semid, semnum)
|
||||
int semid, semnum;
|
||||
{
|
||||
@ -863,7 +865,7 @@ done:
|
||||
* Go through the undo structures for this process and apply the adjustments to
|
||||
* semaphores.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
semexit(p)
|
||||
struct proc *p;
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: sysv_shm.c,v 1.12 1995/12/04 02:26:53 jkh Exp $ */
|
||||
/* $Id: sysv_shm.c,v 1.13 1995/12/07 12:46:55 davidg Exp $ */
|
||||
/* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */
|
||||
|
||||
/*
|
||||
@ -64,7 +64,7 @@ static void shminit __P((void *));
|
||||
SYSINIT(sysv_shm, SI_SUB_SYSV_SHM, SI_ORDER_FIRST, shminit, NULL)
|
||||
|
||||
struct oshmctl_args;
|
||||
int oshmctl __P((struct proc *p, struct oshmctl_args *uap, int *retval));
|
||||
static int oshmctl __P((struct proc *p, struct oshmctl_args *uap, int *retval));
|
||||
static int shmget_allocate_segment __P((struct proc *p, struct shmget_args *uap, int mode, int *retval));
|
||||
static int shmget_existing __P((struct proc *p, struct shmget_args *uap, int mode, int segnum, int *retval));
|
||||
|
||||
@ -80,8 +80,8 @@ sy_call_t *shmcalls[] = {
|
||||
#define SHMSEG_ALLOCATED 0x0800
|
||||
#define SHMSEG_WANTED 0x1000
|
||||
|
||||
vm_map_t sysvshm_map;
|
||||
int shm_last_free, shm_nused, shm_committed;
|
||||
static vm_map_t sysvshm_map;
|
||||
static int shm_last_free, shm_nused, shm_committed;
|
||||
struct shmid_ds *shmsegs;
|
||||
|
||||
struct shm_handle {
|
||||
@ -284,7 +284,7 @@ struct oshmctl_args {
|
||||
struct oshmid_ds *ubuf;
|
||||
};
|
||||
|
||||
int
|
||||
static int
|
||||
oshmctl(p, uap, retval)
|
||||
struct proc *p;
|
||||
struct oshmctl_args *uap;
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tty.c 8.8 (Berkeley) 1/21/94
|
||||
* $Id: tty.c,v 1.72 1995/12/07 12:46:57 davidg Exp $
|
||||
* $Id: tty.c,v 1.73 1995/12/13 15:13:11 julian Exp $
|
||||
*/
|
||||
|
||||
/*-
|
||||
@ -106,6 +106,7 @@ static void ttyretype __P((struct tty *tp));
|
||||
static void ttyrub __P((int c, struct tty *tp));
|
||||
static void ttyrubo __P((struct tty *tp, int cnt));
|
||||
static void ttyunblock __P((struct tty *tp));
|
||||
static int ttywflush __P((struct tty *tp));
|
||||
|
||||
/*
|
||||
* Table with character classes and parity. The 8th bit indicates parity,
|
||||
@ -133,7 +134,7 @@ static void ttyunblock __P((struct tty *tp));
|
||||
#define TB TAB
|
||||
#define VT VTAB
|
||||
|
||||
char const char_type[] = {
|
||||
static char const char_type[] = {
|
||||
E|CC, O|CC, O|CC, E|CC, O|CC, E|CC, E|CC, O|CC, /* nul - bel */
|
||||
O|BS, E|TB, E|NL, O|CC, E|VT, O|CR, O|CC, E|CC, /* bs - si */
|
||||
O|CC, E|CC, E|CC, O|CC, E|CC, O|CC, O|CC, E|CC, /* dle - etb */
|
||||
@ -1126,7 +1127,7 @@ ttywait(tp)
|
||||
/*
|
||||
* Flush if successfully wait.
|
||||
*/
|
||||
int
|
||||
static int
|
||||
ttywflush(tp)
|
||||
struct tty *tp;
|
||||
{
|
||||
@ -1250,26 +1251,6 @@ ttyunblock(tp)
|
||||
ttstart(tp);
|
||||
}
|
||||
|
||||
void
|
||||
ttrstrt(tp_arg)
|
||||
void *tp_arg;
|
||||
{
|
||||
struct tty *tp;
|
||||
int s;
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
if (tp_arg == NULL)
|
||||
panic("ttrstrt");
|
||||
#endif
|
||||
tp = tp_arg;
|
||||
s = spltty();
|
||||
|
||||
CLR(tp->t_state, TS_TIMEOUT);
|
||||
ttstart(tp);
|
||||
|
||||
splx(s);
|
||||
}
|
||||
|
||||
int
|
||||
ttstart(tp)
|
||||
struct tty *tp;
|
||||
@ -2310,6 +2291,7 @@ ttysleep(tp, chan, pri, wmesg, timo)
|
||||
return (tp->t_gen == gen ? 0 : ERESTART);
|
||||
}
|
||||
|
||||
#ifdef notyet
|
||||
/*
|
||||
* XXX this is usable not useful or used. Most tty drivers have
|
||||
* ifdefs for using ttymalloc() but assume a different interface.
|
||||
@ -2327,6 +2309,7 @@ ttymalloc()
|
||||
bzero(tp, sizeof *tp);
|
||||
return (tp);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if 0 /* XXX not yet usable: session leader holds a ref (see kern_exit.c). */
|
||||
/*
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tty_compat.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: tty_compat.c,v 1.17 1995/08/02 12:53:14 ache Exp $
|
||||
* $Id: tty_compat.c,v 1.18 1995/11/18 11:07:00 bde Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -48,6 +48,7 @@
|
||||
#include <sys/file.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/syslog.h>
|
||||
|
||||
static int ttcompatgetflags __P((struct tty *tp));
|
||||
@ -55,7 +56,8 @@ static void ttcompatsetflags __P((struct tty *tp, struct termios *t));
|
||||
static void ttcompatsetlflags __P((struct tty *tp, struct termios *t));
|
||||
static int ttcompatspeedtab __P((int speed, struct speedtab *table));
|
||||
|
||||
int ttydebug = 0;
|
||||
static int ttydebug = 0;
|
||||
SYSCTL_INT(_debug, OID_AUTO, ttydebug, CTLFLAG_RW, &ttydebug, 0, "");
|
||||
|
||||
static struct speedtab compatspeeds[] = {
|
||||
#define MAX_SPEED 17
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tty_pty.c 8.2 (Berkeley) 9/23/93
|
||||
* $Id: tty_pty.c,v 1.31 1995/12/10 15:55:17 bde Exp $
|
||||
* $Id: tty_pty.c,v 1.32 1995/12/13 15:13:15 julian Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -56,9 +56,9 @@
|
||||
#include <sys/devfsext.h>
|
||||
#endif /*DEVFS*/
|
||||
|
||||
void ptyattach __P((int n));
|
||||
void ptsstart __P((struct tty *tp));
|
||||
void ptcwakeup __P((struct tty *tp, int flag));
|
||||
static void ptyattach __P((int n));
|
||||
static void ptsstart __P((struct tty *tp));
|
||||
static void ptcwakeup __P((struct tty *tp, int flag));
|
||||
|
||||
static d_open_t ptsopen;
|
||||
static d_close_t ptsclose;
|
||||
@ -98,14 +98,14 @@ static struct cdevsw ptc_cdevsw =
|
||||
* pts == /dev/tty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv]
|
||||
* ptc == /dev/pty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv]
|
||||
*/
|
||||
struct tty pt_tty[NPTY]; /* XXX */
|
||||
struct pt_ioctl {
|
||||
static struct tty pt_tty[NPTY]; /* XXX */
|
||||
static struct pt_ioctl {
|
||||
int pt_flags;
|
||||
struct selinfo pt_selr, pt_selw;
|
||||
u_char pt_send;
|
||||
u_char pt_ucntl;
|
||||
} pt_ioctl[NPTY]; /* XXX */
|
||||
int npty = NPTY; /* for pstat -t */
|
||||
static int npty = NPTY; /* for pstat -t */
|
||||
|
||||
#define PF_PKT 0x08 /* packet mode */
|
||||
#define PF_STOPPED 0x10 /* user told stopped */
|
||||
@ -118,7 +118,7 @@ int npty = NPTY; /* for pstat -t */
|
||||
*
|
||||
* XXX cdevsw & pstat require the array `pty[]' to be an array
|
||||
*/
|
||||
void
|
||||
static void
|
||||
ptyattach(n)
|
||||
int n;
|
||||
{
|
||||
@ -268,7 +268,7 @@ ptswrite(dev, uio, flag)
|
||||
* Start output on pseudo-tty.
|
||||
* Wake up process selecting or sleeping for input from controlling tty.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
ptsstart(tp)
|
||||
struct tty *tp;
|
||||
{
|
||||
@ -283,7 +283,7 @@ ptsstart(tp)
|
||||
ptcwakeup(tp, FREAD);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
ptcwakeup(tp, flag)
|
||||
struct tty *tp;
|
||||
int flag;
|
||||
@ -770,8 +770,8 @@ static ptc_devsw_installed = 0;
|
||||
#define MAXUNITS (8 * 32)
|
||||
static void *devfs_token_pts[MAXUNITS];
|
||||
static void *devfs_token_ptc[MAXUNITS];
|
||||
const char jnames[] = "pqrsPQRS";
|
||||
const char knames[] = "0123456789abcdefghijklmnopqrstuv";
|
||||
static const char jnames[] = "pqrsPQRS";
|
||||
static const char knames[] = "0123456789abcdefghijklmnopqrstuv";
|
||||
#endif
|
||||
|
||||
static void
|
||||
|
||||
@ -22,9 +22,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/ioctl_compat.h> /* Oooh..We need O/NTTYDISC */
|
||||
#include <sys/proc.h>
|
||||
#define TTYDEFCHARS
|
||||
#include <sys/tty.h>
|
||||
#undef TTYDEFCHARS
|
||||
#include <sys/file.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/uio.h>
|
||||
@ -57,6 +55,7 @@ static struct cdevsw snp_cdevsw =
|
||||
static struct snoop snoopsw[NSNP];
|
||||
|
||||
static struct tty *devtotty __P((dev_t dev));
|
||||
static int snp_detach __P((struct snoop *snp));
|
||||
|
||||
static struct tty *
|
||||
devtotty (dev)
|
||||
@ -320,7 +319,7 @@ snpopen(dev, flag, mode, p)
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
static int
|
||||
snp_detach(snp)
|
||||
struct snoop *snp;
|
||||
{
|
||||
|
||||
@ -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.17 1995/11/02 08:37:22 peter Exp $
|
||||
* $Id: tty_subr.c,v 1.18 1995/11/20 12:15:45 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -24,7 +24,7 @@
|
||||
static void clist_init __P((void *));
|
||||
SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL)
|
||||
|
||||
struct cblock *cfreelist = 0;
|
||||
static struct cblock *cfreelist = 0;
|
||||
int cfreecount = 0;
|
||||
static int cslushcount;
|
||||
static int ctotcount;
|
||||
@ -39,10 +39,10 @@ static void cblock_free __P((struct cblock *cblockp));
|
||||
static void cblock_free_cblocks __P((int number));
|
||||
|
||||
#ifdef DDB
|
||||
static void cbstat __P((void));
|
||||
void DDB_cbstat __P((void));
|
||||
|
||||
static void
|
||||
cbstat()
|
||||
DDB_cbstat()
|
||||
{
|
||||
printf(
|
||||
"tot = %d (active = %d, free = %d (reserved = %d, slush = %d))\n",
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94
|
||||
* $Id: uipc_mbuf.c,v 1.15 1995/12/02 18:58:42 bde Exp $
|
||||
* $Id: uipc_mbuf.c,v 1.16 1995/12/07 12:46:59 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -62,6 +62,8 @@ int max_protohdr;
|
||||
int max_hdr;
|
||||
int max_datalen;
|
||||
|
||||
static void m_reclaim __P((void));
|
||||
|
||||
/* ARGSUSED*/
|
||||
static void
|
||||
mbinit(dummy)
|
||||
@ -168,7 +170,7 @@ m_retryhdr(i, t)
|
||||
return (m);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
m_reclaim()
|
||||
{
|
||||
register struct domain *dp;
|
||||
@ -283,7 +285,7 @@ m_prepend(m, len, how)
|
||||
* continuing for "len" bytes. If len is M_COPYALL, copy to end of mbuf.
|
||||
* The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.
|
||||
*/
|
||||
int MCFail;
|
||||
static int MCFail;
|
||||
|
||||
struct mbuf *
|
||||
m_copym(m, off0, len, wait)
|
||||
@ -495,7 +497,7 @@ m_adj(mp, req_len)
|
||||
* If there is room, it will add up to max_protohdr-len extra bytes to the
|
||||
* contiguous region in an attempt to avoid being called next time.
|
||||
*/
|
||||
int MPFail;
|
||||
static int MPFail;
|
||||
|
||||
struct mbuf *
|
||||
m_pullup(n, len)
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)uipc_proto.c 8.1 (Berkeley) 6/10/93
|
||||
* $Id: uipc_proto.c,v 1.4 1995/08/16 16:13:25 bde Exp $
|
||||
* $Id: uipc_proto.c,v 1.5 1995/12/02 18:58:55 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -47,7 +47,7 @@
|
||||
* Definitions of protocols supported in the LOCAL domain.
|
||||
*/
|
||||
|
||||
struct protosw localsw[] = {
|
||||
static struct protosw localsw[] = {
|
||||
{ SOCK_STREAM, &localdomain, 0, PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS,
|
||||
0, 0, 0, 0,
|
||||
uipc_usrreq,
|
||||
|
||||
@ -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.76 1995/12/11 04:56:05 dyson Exp $
|
||||
* $Id: vfs_bio.c,v 1.78 1995/12/13 03:47:01 dyson Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -58,7 +58,7 @@
|
||||
#include <miscfs/specfs/specdev.h>
|
||||
|
||||
static void vfs_update __P((void));
|
||||
struct proc *updateproc;
|
||||
static struct proc *updateproc;
|
||||
static struct kproc_desc up_kp = {
|
||||
"update",
|
||||
vfs_update,
|
||||
@ -70,9 +70,11 @@ struct buf *buf; /* buffer header pool */
|
||||
struct swqueue bswlist;
|
||||
|
||||
int count_lock_queue __P((void));
|
||||
void vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to);
|
||||
void vm_hold_load_pages(struct buf * bp, vm_offset_t from, vm_offset_t to);
|
||||
void vfs_clean_pages(struct buf * bp);
|
||||
static void vm_hold_free_pages(struct buf * bp, vm_offset_t from,
|
||||
vm_offset_t to);
|
||||
static void vm_hold_load_pages(struct buf * bp, vm_offset_t from,
|
||||
vm_offset_t to);
|
||||
static void vfs_clean_pages(struct buf * bp);
|
||||
static void vfs_setdirty(struct buf *bp);
|
||||
|
||||
int needsbuffer;
|
||||
@ -97,12 +99,12 @@ caddr_t buffers_kva;
|
||||
* but the code is intricate enough already.
|
||||
*/
|
||||
vm_page_t bogus_page;
|
||||
vm_offset_t bogus_offset;
|
||||
static vm_offset_t bogus_offset;
|
||||
|
||||
int bufspace, maxbufspace;
|
||||
static int bufspace, maxbufspace;
|
||||
|
||||
struct bufhashhdr bufhashtbl[BUFHSZ], invalhash;
|
||||
struct bqueues bufqueues[BUFFER_QUEUES];
|
||||
static struct bufhashhdr bufhashtbl[BUFHSZ], invalhash;
|
||||
static struct bqueues bufqueues[BUFFER_QUEUES];
|
||||
|
||||
#define BUF_MAXUSE 8
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ktrace.h 8.1 (Berkeley) 6/2/93
|
||||
* $Id: ktrace.h,v 1.6 1994/10/02 17:24:48 phk Exp $
|
||||
* $Id: ktrace.h,v 1.7 1995/03/16 18:16:19 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_KTRACE_H_
|
||||
@ -152,10 +152,6 @@ struct ktr_csw {
|
||||
#ifdef KERNEL
|
||||
void ktrnamei __P((struct vnode *,char *));
|
||||
void ktrcsw __P((struct vnode *,int,int));
|
||||
void ktrwrite __P((struct vnode *, struct ktr_header *));
|
||||
int ktrcanset __P((struct proc *,struct proc *));
|
||||
int ktrsetchildren __P((struct proc *,struct proc *,int,int,struct vnode *));
|
||||
int ktrops __P((struct proc *,struct proc *,int,int,struct vnode *));
|
||||
void ktrpsig __P((struct vnode *,int, sig_t, int, int));
|
||||
void ktrgenio __P((struct vnode *,int, enum uio_rw,struct iovec *,int,int));
|
||||
void ktrsyscall __P((struct vnode *, int, int narg, int args[]));
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)lockf.h 8.1 (Berkeley) 6/11/93
|
||||
* $Id: lockf.h,v 1.1 1994/08/08 17:30:58 davidg Exp $
|
||||
* $Id: lockf.h,v 1.2 1994/08/21 04:41:50 paul Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_LOCKF_H_
|
||||
@ -62,16 +62,6 @@ struct lockf {
|
||||
|
||||
__BEGIN_DECLS
|
||||
int lf_advlock __P((struct vop_advlock_args *, struct lockf **, u_quad_t));
|
||||
void lf_addblock __P((struct lockf *, struct lockf *));
|
||||
int lf_clearlock __P((struct lockf *));
|
||||
int lf_findoverlap __P((struct lockf *,
|
||||
struct lockf *, int, struct lockf ***, struct lockf **));
|
||||
struct lockf *
|
||||
lf_getblock __P((struct lockf *));
|
||||
int lf_getlock __P((struct lockf *, struct flock *));
|
||||
int lf_setlock __P((struct lockf *));
|
||||
void lf_split __P((struct lockf *, struct lockf *));
|
||||
void lf_wakelock __P((struct lockf *));
|
||||
__END_DECLS
|
||||
|
||||
#ifdef LOCKF_DEBUG
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)mbuf.h 8.3 (Berkeley) 1/21/94
|
||||
* $Id: mbuf.h,v 1.10 1995/07/29 11:42:46 bde Exp $
|
||||
* $Id: mbuf.h,v 1.11 1995/11/21 12:55:12 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_MBUF_H_
|
||||
@ -373,7 +373,6 @@ int m_clalloc __P((int, int));
|
||||
void m_copyback __P((struct mbuf *, int, int, caddr_t));
|
||||
struct mbuf *m_retry __P((int, int));
|
||||
struct mbuf *m_retryhdr __P((int, int));
|
||||
void m_reclaim __P((void));
|
||||
struct mbuf *m_get __P((int, int));
|
||||
struct mbuf *m_gethdr __P((int, int));
|
||||
struct mbuf *m_getclr __P((int, int));
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)signalvar.h 8.3 (Berkeley) 1/4/94
|
||||
* $Id: signalvar.h,v 1.6 1995/10/19 19:16:01 swallace Exp $
|
||||
* $Id: signalvar.h,v 1.7 1995/11/19 00:51:29 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_SIGNALVAR_H_ /* tmp for user.h */
|
||||
@ -104,7 +104,7 @@ struct sigacts {
|
||||
#define SA_CANTMASK 0x40 /* non-maskable, catchable */
|
||||
|
||||
#ifdef SIGPROP
|
||||
int sigprop[NSIG + 1] = {
|
||||
static int sigprop[NSIG + 1] = {
|
||||
0, /* unused */
|
||||
SA_KILL, /* SIGHUP */
|
||||
SA_KILL, /* SIGINT */
|
||||
@ -151,7 +151,6 @@ int sigprop[NSIG + 1] = {
|
||||
/*
|
||||
* Machine-independent functions:
|
||||
*/
|
||||
int coredump __P((struct proc *p));
|
||||
void execsigs __P((struct proc *p));
|
||||
void gsignal __P((int pgid, int sig));
|
||||
int issig __P((struct proc *p));
|
||||
|
||||
@ -70,7 +70,6 @@ struct snoop {
|
||||
|
||||
#ifdef KERNEL
|
||||
/* XXX several wrong storage classes and types here. */
|
||||
int snp_detach __P((struct snoop *snp));
|
||||
int snpdown __P((struct snoop *snp));
|
||||
int snpin __P((struct snoop *snp, char *buf, int n));
|
||||
int snpinc __P((struct snoop *snp, char c));
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)socketvar.h 8.1 (Berkeley) 6/2/93
|
||||
* $Id: socketvar.h,v 1.6 1995/05/30 08:14:33 rgrimes Exp $
|
||||
* $Id: socketvar.h,v 1.7 1995/11/21 12:55:14 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_SOCKETVAR_H_
|
||||
@ -205,11 +205,8 @@ extern char netio[], netcon[], netcls[];
|
||||
/*
|
||||
* File operations on sockets.
|
||||
*/
|
||||
int soo_read __P((struct file *fp, struct uio *uio, struct ucred *cred));
|
||||
int soo_write __P((struct file *fp, struct uio *uio, struct ucred *cred));
|
||||
int soo_ioctl __P((struct file *fp, int com, caddr_t data, struct proc *p));
|
||||
int soo_select __P((struct file *fp, int which, struct proc *p));
|
||||
int soo_close __P((struct file *fp, struct proc *p));
|
||||
int soo_stat __P((struct socket *, struct stat *));
|
||||
|
||||
/*
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tty.h 8.6 (Berkeley) 1/21/94
|
||||
* $Id: tty.h,v 1.31 1995/07/31 22:50:08 bde Exp $
|
||||
* $Id: tty.h,v 1.32 1995/12/08 11:19:32 julian Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_TTY_H_
|
||||
@ -235,7 +235,6 @@ void termioschars __P((struct termios *t));
|
||||
int tputchar __P((int c, struct tty *tp));
|
||||
int ttioctl __P((struct tty *tp, int com, void *data, int flag));
|
||||
int ttread __P((struct tty *tp, struct uio *uio, int flag));
|
||||
void ttrstrt __P((void *tp));
|
||||
int ttyselect __P((struct tty *tp, int rw, struct proc *p));
|
||||
int ttselect __P((dev_t dev, int rw, struct proc *p));
|
||||
void ttsetwater __P((struct tty *tp));
|
||||
@ -257,7 +256,6 @@ int ttyopen __P((dev_t device, struct tty *tp));
|
||||
int ttysleep __P((struct tty *tp,
|
||||
void *chan, int pri, char *wmesg, int timeout));
|
||||
int ttywait __P((struct tty *tp));
|
||||
int ttywflush __P((struct tty *tp));
|
||||
struct tty *ttymalloc __P((void));
|
||||
void ttyfree __P((struct tty *));
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
* from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
|
||||
*
|
||||
* @(#)swap_pager.c 8.9 (Berkeley) 3/21/94
|
||||
* $Id: swap_pager.c,v 1.54 1995/12/11 04:58:02 dyson Exp $
|
||||
* $Id: swap_pager.c,v 1.55 1995/12/11 15:43:33 dyson Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -160,7 +160,6 @@ static int swap_pager_getswapspace __P((vm_object_t object,
|
||||
daddr_t *rtval));
|
||||
static void swap_pager_iodone __P((struct buf *));
|
||||
static void swap_pager_iodone1 __P((struct buf *bp));
|
||||
static int swap_pager_ready __P((void));
|
||||
static void swap_pager_reclaim __P((void));
|
||||
static void swap_pager_ridpages __P((vm_page_t *m, int count,
|
||||
int reqpage));
|
||||
@ -1607,15 +1606,3 @@ swap_pager_iodone(bp)
|
||||
}
|
||||
splx(s);
|
||||
}
|
||||
|
||||
/*
|
||||
* return true if any swap control structures can be allocated
|
||||
*/
|
||||
static int
|
||||
swap_pager_ready()
|
||||
{
|
||||
if (swap_pager_free.tqh_first)
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user