From: Bill Joy <bill@ucbvax.Berkeley.EDU>
Date: Mon, 10 Nov 1980 15:02:00 +0000 (-0800)
Subject: minor lint
X-Git-Tag: BSD-4^3~26
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/49c84d3f1891f656634d6e8c4d6d40cbcb46c4aa

minor lint

SCCS-vsn: sys/vax/mba/mba.c 4.2
SCCS-vsn: sys/kern/tty.c 4.2
SCCS-vsn: sys/vax/uba/uba.c 4.2
SCCS-vsn: sys/vm/vm_swap.c 4.2
SCCS-vsn: sys/vax/uba/up.c 4.2
SCCS-vsn: sys/kern/kern_resource.c 4.2
SCCS-vsn: sys/kern/subr_prf.c 4.2
SCCS-vsn: sys/vax/vax/machdep.c 4.2
---

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index 6593c7d766..f3488463e9 100644
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*	kern_resource.c	4.1	%G%	*/
+/*	kern_resource.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -61,16 +61,16 @@ acct()
 	plock(ip);
 	for (i=0; i<sizeof(acctbuf.ac_comm); i++)
 		acctbuf.ac_comm[i] = u.u_comm[i];
-	acctbuf.ac_utime = compress(u.u_vm.vm_utime);
-	acctbuf.ac_stime = compress(u.u_vm.vm_stime);
-	acctbuf.ac_etime = compress(time - u.u_start);
+	acctbuf.ac_utime = compress((long)u.u_vm.vm_utime);
+	acctbuf.ac_stime = compress((long)u.u_vm.vm_stime);
+	acctbuf.ac_etime = compress((long)(time - u.u_start));
 	acctbuf.ac_btime = u.u_start;
 	acctbuf.ac_uid = u.u_ruid;
 	acctbuf.ac_gid = u.u_rgid;
 	acctbuf.ac_mem = 0;
 	if (i = u.u_vm.vm_utime + u.u_vm.vm_stime)
 		acctbuf.ac_mem = (u.u_vm.vm_ixrss + u.u_vm.vm_idsrss) / i;
-	acctbuf.ac_io = compress(u.u_vm.vm_inblk + u.u_vm.vm_oublk);
+	acctbuf.ac_io = compress((long)(u.u_vm.vm_inblk + u.u_vm.vm_oublk));
 	acctbuf.ac_tty = u.u_ttyd;
 	acctbuf.ac_flag = u.u_acflag;
 	siz = ip->i_size;
@@ -90,7 +90,7 @@ acct()
  * with 3 bits base-8 exponent, 13 bits fraction.
  */
 compress(t)
-register time_t t;
+register long t;
 {
 	register exp = 0, round = 0;
 
diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c
index 2d1483485c..32606943b8 100644
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*	subr_prf.c	4.1	%G%	*/
+/*	subr_prf.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -200,10 +200,10 @@ char	*msgbufp = msgbuf;	/* Next saved printf character */
  * If destination is console then the last MSGBUFS characters
  * are saved in msgbuf for inspection later.
  */
+/*ARGSUSED*/
 putchar(c, trace)
 register c;
 {
-	register s, timo;
 
 #ifdef TRACE
 	if (trace) {
diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index 6dae84633d..4024cdc239 100644
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	tty.c	4.1	%G%	*/
+/*	tty.c	4.2	%G%	*/
 
 /*
  * TTY subroutines common to more than one line discipline
@@ -197,6 +197,7 @@ register struct tty *tp;
 /*
  * Common code for tty ioctls.
  */
+/*ARGSUSED*/
 ttioctl(com, tp, addr, dev, flag)
 register struct tty *tp;
 caddr_t addr;
diff --git a/usr/src/sys/vax/mba/mba.c b/usr/src/sys/vax/mba/mba.c
index e8e9c05aa5..ce0cca82e7 100644
--- a/usr/src/sys/vax/mba/mba.c
+++ b/usr/src/sys/vax/mba/mba.c
@@ -1,4 +1,4 @@
-/*	mba.c	4.1	%G%	*/
+/*	mba.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/buf.h"
@@ -72,8 +72,8 @@ mbastart(bp, adcr)
 		*adcr = MBAWCOM | GO;
 }
 
-mbainit(mbanum)
-	int mbanum;
+mbainit(mbano)
+	int mbano;
 {
 	register struct pte *b;
 	register int i;
@@ -81,7 +81,7 @@ mbainit(mbanum)
 	register struct mba_regs *mbap;
 	unsigned v;
 
-	mi = &mbainfo[mbanum];
+	mi = &mbainfo[mbano];
 	v = btop((int)mi->mi_phys);
 	b = mi->mi_map;
 	for (i = 0; i < 8192; i += NBPG) {
@@ -92,5 +92,5 @@ mbainit(mbanum)
 	mbap = mi->mi_loc;
 	mbap->mba_cr = MBAINIT;
 	mbap->mba_cr = MBAIE;
-	mbaact |= (1<<mbanum);
+	mbaact |= (1<<mbano);
 }
diff --git a/usr/src/sys/vax/uba/uba.c b/usr/src/sys/vax/uba/uba.c
index 5cd4006e38..0a5f4e91c2 100644
--- a/usr/src/sys/vax/uba/uba.c
+++ b/usr/src/sys/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/*	uba.c	4.1	%G%	*/
+/*	uba.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/map.h"
@@ -137,7 +137,7 @@ ubareset()
 {
 	struct uba_regs *up = (struct uba_regs *)UBA0;
 	register struct cdevsw *cdp;
-	int i, s;
+	int s;
 
 	s = spl6();
 	printf("UBA RESET:");
diff --git a/usr/src/sys/vax/uba/up.c b/usr/src/sys/vax/uba/up.c
index e66cd05fd6..7646672a9d 100644
--- a/usr/src/sys/vax/uba/up.c
+++ b/usr/src/sys/vax/uba/up.c
@@ -1,4 +1,4 @@
-/*	up.c	4.1	%G%	*/
+/*	up.c	4.2	%G%	*/
 
 #include "../conf/up.h"
 /*
@@ -207,7 +207,7 @@ register struct buf *bp;
 	long sz, bn;
 
 	if (upwstart == 0) {
-		timeout((caddr_t)upwatch, 0, HZ);
+		timeout(upwatch, (caddr_t)0, HZ);
 		upwstart++;
 	}
 	xunit = minor(bp->b_dev) & 077;
@@ -528,7 +528,8 @@ upintr()
 			else
 				uptab.b_active = 0;	/* To force retry */
 			if (uptab.b_errcnt > 27)
-				deverror(bp, upaddr->upcs2, upaddr->uper1);
+				deverror(bp, (int)upaddr->upcs2,
+				    (int)upaddr->uper1);
 			/*
 			 * If this was a correctible ECC error, let upecc
 			 * do the dirty work to correct it.  If upecc
@@ -610,7 +611,6 @@ upintr()
 	if (uptab.b_actf && uptab.b_active == 0)
 		if (upstart())
 			needie = 0;
-out:
 	if (needie)
 		upaddr->upcs1 = IE;
 }
@@ -745,7 +745,7 @@ upwatch()
 {
 	int i;
 
-	timeout((caddr_t)upwatch, 0, HZ);
+	timeout(upwatch, (caddr_t)0, HZ);
 	if (uptab.b_active == 0) {
 		for (i = 0; i < NUP; i++)
 			if (uputab[i].b_active)
diff --git a/usr/src/sys/vax/vax/machdep.c b/usr/src/sys/vax/vax/machdep.c
index 283238b7d7..8d3f9920b8 100644
--- a/usr/src/sys/vax/vax/machdep.c
+++ b/usr/src/sys/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/*	machdep.c	4.1	%G%	*/
+/*	machdep.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -16,7 +16,7 @@
 #include "../h/cons.h"
 #include "../h/reboot.h"
 
-char	version[] = "VM/UNIX (Berkeley Version 4.1) %H% \n";
+char	version[] = "VM/UNIX (Berkeley Version 4.2) %H% \n";
 int	icode[] =
 {
 	0x9f19af9f,	/* pushab [&"init.vm",0]; pushab */
diff --git a/usr/src/sys/vm/vm_swap.c b/usr/src/sys/vm/vm_swap.c
index 141e8e1e5c..a0c70ee5d5 100644
--- a/usr/src/sys/vm/vm_swap.c
+++ b/usr/src/sys/vm/vm_swap.c
@@ -1,4 +1,4 @@
-/*	vm_swap.c	4.1	%G%	*/
+/*	vm_swap.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -55,14 +55,10 @@ swwrite(dev)
  */
 vswapon()
 {
-	register struct a {
-		char	*sname;
-	} *uap;
 	register struct inode *ip;
 	dev_t dev;
 	register struct swdevt *sp;
 
-	uap = (struct a *)u.u_ap;
 	ip = namei(uchar, 0);
 	if (ip == NULL)
 		return;