Remove a bunch of variables which were unused both in GENERIC and LINT.

Found by:	-Wunused

78 files changed, 130 insertions, 249 deletions

diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index ec48c42..56fdf1d 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.6 1997/09/24 07:47:43 phk Exp $
+ *      $Id: bios.c,v 1.7 1997/10/21 07:40:22 msmith Exp $
  */
 
 /*
@@ -208,7 +208,6 @@ u_int32_t
 bios_sigsearch(u_int32_t start, u_char *sig, int siglen, int paralen, int sigofs)
 {
     u_char	*sp, *end;
-    int		i;
     
     /* compute the starting address */
     if ((start >= BIOS_START) && (start <= (BIOS_START + BIOS_SIZE))) {
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index ef9674f..b1d4ba6 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.31 1997/11/05 15:12:44 kato Exp $
+ *	$Id: identcpu.c,v 1.32 1997/11/06 03:10:28 kato Exp $
  */
 
 #include "opt_cpu.h"
@@ -707,7 +707,6 @@ static void
 print_AMD_info(void) 
 {
 	u_long regs[4];
-	int i;
 
 	do_cpuid(0x80000000, regs);
 	if (regs[0] >= 0x80000005) {
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 03a30f0..5a17855 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.168 1997/10/27 00:34:15 dyson Exp $
+ *	$Id: pmap.c,v 1.169 1997/10/28 15:58:11 bde Exp $
  */
 
 /*
@@ -978,7 +978,6 @@ pmap_swapin_proc(p)
 	int i;
 	vm_object_t upobj;
 	vm_page_t m;
-	unsigned *pte;
 
 	upobj = p->p_upages_obj;
 	for(i=0;i<UPAGES;i++) {
@@ -1574,7 +1573,6 @@ get_pv_entry(void)
 void
 pmap_collect() {
 	pv_table_t *ppv;
-	pv_entry_t pv;
 	int i;
 	vm_offset_t pa;
 	vm_page_t m;
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 5a3df2f..f4db11d 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.126 1997/10/29 00:51:50 jdp Exp $
+ *	$Id: if_ed.c,v 1.127 1997/11/02 07:12:52 davidg Exp $
  */
 
 /*
@@ -2570,7 +2570,6 @@ ed_ioctl(ifp, command, data)
 	caddr_t data;
 {
 	struct ed_softc *sc = ifp->if_softc;
-	struct ifreq *ifr = (struct ifreq *) data;
 	int     s, error = 0;
 
 	if (sc->gone) {
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index f1e7262..de62d63 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.31 1997/09/21 21:35:23 gibbs Exp $
+ *	$Id: eisaconf.c,v 1.32 1997/10/28 15:58:08 bde Exp $
  */
 
 #include "opt_eisa.h"
@@ -112,7 +112,6 @@ void
 eisa_configure()
 {
 	int i,slot;
-	char *id_string;
 	struct eisa_device_node *dev_node;
 	struct eisa_driver **e_drvp;
 	struct eisa_driver *e_drv;
@@ -369,8 +368,6 @@ eisa_add_intr(e_dev, irq)
 	int irq;
 {
 	struct	irq_node *irq_info;
-	void	*dev_instance = (void *)-1; /* XXX use cfg->devdata  */
-	void	*idesc;
  
 	irq_info = (struct irq_node *)malloc(sizeof(*irq_info), M_DEVBUF,
 					     M_NOWAIT);
@@ -392,8 +389,6 @@ eisa_reg_intr(e_dev, irq, func, arg, maskptr, shared)
 	u_int *maskptr;
 	int   shared;
 {
-	int result;
-	int s;
 	char string[25];
 	char separator = ',';
 
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 90f1f2e..648b577 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.64 1997/10/26 21:08:40 nate Exp $
+ *  $Id: if_ep.c,v 1.65 1997/10/27 00:02:33 fenner Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -568,9 +568,7 @@ int
 ep_attach(sc)
     struct ep_softc *sc;
 {
-    struct ifaddr *ifa;
     struct ifnet *ifp = &sc->arpcom.ac_if;
-    struct sockaddr_dl *sdl;
     u_short *p;
     int i;
     int attached;
@@ -1032,7 +1030,6 @@ epread(sc)
     int lenthisone;
 
     short rx_fifo2, status;
-    register short delta;
     register short rx_fifo;
 
     ifp = &sc->arpcom.ac_if;
@@ -1129,7 +1126,6 @@ read_again:
 	outw(BASE + EP_COMMAND, SET_RX_EARLY_THRESH | RX_NEXT_EARLY_THRESH);
 	return;
     }
-all_pkt:
     outw(BASE + EP_COMMAND, RX_DISCARD_TOP_PACK);
     ++ifp->if_ipackets;
     ep_fset(F_RX_FIRST);
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index fd8714c..6599e60 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: if_ex.c,v 1.7 1997/09/26 17:17:43 msmith Exp $
  */
 
 /*
@@ -249,8 +249,6 @@ int ex_attach(struct isa_device *dev)
 	int unit = dev->id_unit;
 	struct ex_softc *sc = &ex_sc[unit];
 	struct ifnet *ifp = &sc->arpcom.ac_if;
-	struct ifaddr *ifa;
-	struct sockaddr_dl *sdl;
 
 	DODEBUG(Start_End, printf("ex_attach%d: start\n", unit););
 
@@ -393,7 +391,7 @@ void ex_start(struct ifnet *ifp)
   register struct ex_softc *sc = &ex_sc[unit];
   register int iobase = sc->iobase;
   int i, s, len, data_len, avail, dest, next;
-  unsigned char tmp16[2], *cP;
+  unsigned char tmp16[2];
   struct mbuf *opkt;
   register struct mbuf *m;
 
@@ -570,7 +568,7 @@ void exintr(int unit)
   struct ex_softc *sc = &ex_sc[unit];
   struct ifnet *ifp = &sc->arpcom.ac_if;
   int iobase = sc->iobase;
-  int s, int_status, send_pkts;
+  int int_status, send_pkts;
 
   DODEBUG(Start_End, printf("exintr%d: start\n", unit););
 
@@ -871,7 +869,6 @@ int ex_ioctl(register struct ifnet *ifp, int cmd, caddr_t data)
 void ex_reset(int unit)
 {
   struct ex_softc *sc = &ex_sc[unit];
-  struct ifnet *ifp = &sc->arpcom.ac_if;
   int s;
 
   DODEBUG(Start_End, printf("ex_reset%d: start\n", unit););
@@ -889,7 +886,6 @@ void ex_reset(int unit)
 
 void ex_watchdog(struct ifnet *ifp)
 {
-  struct ex_softc *sc = &ex_sc[ifp->if_unit];
 
   DODEBUG(Start_End, printf("ex_watchdog%d: start\n", ifp->if_unit););
 
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 1353411..fbdc2e6 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.32 1997/10/26 21:08:41 nate Exp $
+ * $Id: if_fe.c,v 1.33 1997/10/29 15:54:19 nate Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -1128,7 +1128,7 @@ fe_init_ati ( struct fe_softc * sc )
 static int
 fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
 {
-	int i,type;
+	int i;
 
 	static struct fe_simple_probe_struct probe_table [] = {
 		{ FE_DLCR2, 0x70, 0x00 },
@@ -1680,7 +1680,7 @@ static void
 fe_init ( int unit )
 {
 	struct fe_softc *sc = &fe_softc[unit];
-	int i, s;
+	int s;
 
 #if FE_DEBUG >= 3
 	fe_dump( LOG_INFO, sc, "init()" );
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 8f85db6..377f589 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.93 1997/07/20 14:10:06 bde Exp $
+ *	$Id: mcd.c,v 1.94 1997/09/21 21:41:26 gibbs Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -187,7 +187,9 @@ static	int	mcd_subchan(int unit, struct ioc_read_subchannel *sc);
 static	int	mcd_toc_header(int unit, struct ioc_toc_header *th);
 static	int	mcd_read_toc(int unit);
 static  int     mcd_toc_entrys(int unit, struct ioc_read_toc_entry *te);
+#if 0
 static  int     mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te);
+#endif
 static	int	mcd_stop(int unit);
 static  int     mcd_eject(int unit);
 static  int     mcd_inject(int unit);
@@ -1421,6 +1423,7 @@ mcd_read_toc(int unit)
 	return 0;
 }
 
+#if 0
 static int
 mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te)
 {
@@ -1471,6 +1474,7 @@ mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te)
 	}
 	return 0;
 }
+#endif
 
 static int
 mcd_toc_entrys(int unit, struct ioc_read_toc_entry *te)
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 468ec05..f94498d 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.78 1997/08/02 14:33:12 bde Exp $
+ * $Id: pci.c,v 1.79 1997/09/14 03:19:36 peter Exp $
  *
  */
 
@@ -357,6 +357,7 @@ pci_readcfg(pcicfgregs *probe)
 	return (cfg);
 }
 
+#if 0
 /* free pcicfgregs structure and all depending data structures */
 
 static int
@@ -369,6 +370,7 @@ pci_freecfg(pcicfgregs *cfg)
 	free(cfg, M_DEVBUF);
 	return (0);
 }
+#endif
 
 static void
 pci_addcfg(pcicfgregs *cfg)
@@ -491,9 +493,7 @@ pci_close(dev_t dev, int flag, int devtype, struct proc *p)
 static int
 pci_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 {
-	struct pci_conf_io *cio;
 	struct pci_io *io;
-	size_t iolen;
 	int error;
 
 	if (cmd != PCIOCGETCONF && !(flag & FWRITE))
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index cdca487..7f6d409 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.235 1997/10/23 03:23:49 yokota Exp $
+ *  $Id: syscons.c,v 1.236 1997/10/26 07:36:13 yokota Exp $
  */
 
 #include "sc.h"
@@ -595,7 +595,6 @@ sckbdprobe(int unit, int flags)
 	goto fail;
     }
 
-succeed: 
     kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
     kbdc_lock(sc_kbdc, FALSE);
     return TRUE;
@@ -3451,7 +3450,6 @@ static void
 set_keyboard(int command, int data)
 {
     int s;
-    int c;
 
     if (sc_kbdc == NULL)
 	return;
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index f1f744f..420e6c1 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -905,7 +905,6 @@ vxioctl(ifp, cmd, data)
     caddr_t data;
 {
     struct vx_softc *sc = vx_softc[ifp->if_unit];
-    struct ifaddr *ifa = (struct ifaddr *) data;
     struct ifreq *ifr = (struct ifreq *) data;
     int s, error = 0;
 
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index cf36e92..2f7baef 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.18 1997/09/10 19:43:15 phk Exp $
+ * $Id: cd9660_lookup.c,v 1.19 1997/10/16 10:47:33 phk Exp $
  */
 
 #include <sys/param.h>
@@ -117,7 +117,6 @@ cd9660_lookup(ap)
 	char *name;
 	struct vnode **vpp = ap->a_vpp;
 	struct componentname *cnp = ap->a_cnp;
-	struct ucred *cred = cnp->cn_cred;
 	int flags = cnp->cn_flags;
 	int nameiop = cnp->cn_nameiop;
 	struct proc *p = cnp->cn_proc;
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index d3db4a1..4bc152e 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.30 1997/10/12 20:23:38 phk Exp $
+ * $Id: cd9660_vfsops.c,v 1.31 1997/10/16 10:47:43 phk Exp $
  */
 
 #include <sys/param.h>
@@ -269,7 +269,7 @@ iso_mountfs(devvp, mp, p, argp)
 	int ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
 	int iso_bsize;
 	int iso_blknum;
-	struct iso_volume_descriptor *vdp;
+	struct iso_volume_descriptor *vdp = 0;
 	struct iso_primary_descriptor *pri;
 	struct iso_sierra_primary_descriptor *pri_sierra;
 	struct iso_directory_record *rootp;
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index ef82b11..b9fc5b2 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.40 1997/10/27 13:33:41 bde Exp $
+ *	$Id: procfs_vnops.c,v 1.41 1997/10/27 15:39:01 bde Exp $
  */
 
 /*
@@ -590,7 +590,6 @@ procfs_lookup(ap)
 	struct vnode *dvp = ap->a_dvp;
 	char *pname = cnp->cn_nameptr;
 	struct proc *curp = cnp->cn_proc;
-	int error = 0;
 	struct proc_target *pt;
 	struct vnode *fvp;
 	pid_t pid;
@@ -775,7 +774,6 @@ procfs_readdir(ap)
 		int pcnt = 0;
 		volatile struct proc *p = allproc.lh_first;
 
-	again:
 		for (; p && uio->uio_resid >= UIO_MX; i++, pcnt++) {
 			bzero((char *) dp, UIO_MX);
 			dp->d_reclen = UIO_MX;
@@ -846,7 +844,6 @@ static int
 procfs_readlink(ap)
 	struct vop_readlink_args *ap;
 {
-	struct uio *uio = ap->a_uio;
 	char buf[16];		/* should be enough */
 	int len;
 
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index f1e7262..de62d63 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.31 1997/09/21 21:35:23 gibbs Exp $
+ *	$Id: eisaconf.c,v 1.32 1997/10/28 15:58:08 bde Exp $
  */
 
 #include "opt_eisa.h"
@@ -112,7 +112,6 @@ void
 eisa_configure()
 {
 	int i,slot;
-	char *id_string;
 	struct eisa_device_node *dev_node;
 	struct eisa_driver **e_drvp;
 	struct eisa_driver *e_drv;
@@ -369,8 +368,6 @@ eisa_add_intr(e_dev, irq)
 	int irq;
 {
 	struct	irq_node *irq_info;
-	void	*dev_instance = (void *)-1; /* XXX use cfg->devdata  */
-	void	*idesc;
  
 	irq_info = (struct irq_node *)malloc(sizeof(*irq_info), M_DEVBUF,
 					     M_NOWAIT);
@@ -392,8 +389,6 @@ eisa_reg_intr(e_dev, irq, func, arg, maskptr, shared)
 	u_int *maskptr;
 	int   shared;
 {
-	int result;
-	int s;
 	char string[25];
 	char separator = ',';
 
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index ec48c42..56fdf1d 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.6 1997/09/24 07:47:43 phk Exp $
+ *      $Id: bios.c,v 1.7 1997/10/21 07:40:22 msmith Exp $
  */
 
 /*
@@ -208,7 +208,6 @@ u_int32_t
 bios_sigsearch(u_int32_t start, u_char *sig, int siglen, int paralen, int sigofs)
 {
     u_char	*sp, *end;
-    int		i;
     
     /* compute the starting address */
     if ((start >= BIOS_START) && (start <= (BIOS_START + BIOS_SIZE))) {
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index ef9674f..b1d4ba6 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.31 1997/11/05 15:12:44 kato Exp $
+ *	$Id: identcpu.c,v 1.32 1997/11/06 03:10:28 kato Exp $
  */
 
 #include "opt_cpu.h"
@@ -707,7 +707,6 @@ static void
 print_AMD_info(void) 
 {
 	u_long regs[4];
-	int i;
 
 	do_cpuid(0x80000000, regs);
 	if (regs[0] >= 0x80000005) {
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 03a30f0..5a17855 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.168 1997/10/27 00:34:15 dyson Exp $
+ *	$Id: pmap.c,v 1.169 1997/10/28 15:58:11 bde Exp $
  */
 
 /*
@@ -978,7 +978,6 @@ pmap_swapin_proc(p)
 	int i;
 	vm_object_t upobj;
 	vm_page_t m;
-	unsigned *pte;
 
 	upobj = p->p_upages_obj;
 	for(i=0;i<UPAGES;i++) {
@@ -1574,7 +1573,6 @@ get_pv_entry(void)
 void
 pmap_collect() {
 	pv_table_t *ppv;
-	pv_entry_t pv;
 	int i;
 	vm_offset_t pa;
 	vm_page_t m;
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 5a3df2f..f4db11d 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.126 1997/10/29 00:51:50 jdp Exp $
+ *	$Id: if_ed.c,v 1.127 1997/11/02 07:12:52 davidg Exp $
  */
 
 /*
@@ -2570,7 +2570,6 @@ ed_ioctl(ifp, command, data)
 	caddr_t data;
 {
 	struct ed_softc *sc = ifp->if_softc;
-	struct ifreq *ifr = (struct ifreq *) data;
 	int     s, error = 0;
 
 	if (sc->gone) {
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 90f1f2e..648b577 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.64 1997/10/26 21:08:40 nate Exp $
+ *  $Id: if_ep.c,v 1.65 1997/10/27 00:02:33 fenner Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -568,9 +568,7 @@ int
 ep_attach(sc)
     struct ep_softc *sc;
 {
-    struct ifaddr *ifa;
     struct ifnet *ifp = &sc->arpcom.ac_if;
-    struct sockaddr_dl *sdl;
     u_short *p;
     int i;
     int attached;
@@ -1032,7 +1030,6 @@ epread(sc)
     int lenthisone;
 
     short rx_fifo2, status;
-    register short delta;
     register short rx_fifo;
 
     ifp = &sc->arpcom.ac_if;
@@ -1129,7 +1126,6 @@ read_again:
 	outw(BASE + EP_COMMAND, SET_RX_EARLY_THRESH | RX_NEXT_EARLY_THRESH);
 	return;
     }
-all_pkt:
     outw(BASE + EP_COMMAND, RX_DISCARD_TOP_PACK);
     ++ifp->if_ipackets;
     ep_fset(F_RX_FIRST);
diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index fd8714c..6599e60 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: if_ex.c,v 1.7 1997/09/26 17:17:43 msmith Exp $
  */
 
 /*
@@ -249,8 +249,6 @@ int ex_attach(struct isa_device *dev)
 	int unit = dev->id_unit;
 	struct ex_softc *sc = &ex_sc[unit];
 	struct ifnet *ifp = &sc->arpcom.ac_if;
-	struct ifaddr *ifa;
-	struct sockaddr_dl *sdl;
 
 	DODEBUG(Start_End, printf("ex_attach%d: start\n", unit););
 
@@ -393,7 +391,7 @@ void ex_start(struct ifnet *ifp)
   register struct ex_softc *sc = &ex_sc[unit];
   register int iobase = sc->iobase;
   int i, s, len, data_len, avail, dest, next;
-  unsigned char tmp16[2], *cP;
+  unsigned char tmp16[2];
   struct mbuf *opkt;
   register struct mbuf *m;
 
@@ -570,7 +568,7 @@ void exintr(int unit)
   struct ex_softc *sc = &ex_sc[unit];
   struct ifnet *ifp = &sc->arpcom.ac_if;
   int iobase = sc->iobase;
-  int s, int_status, send_pkts;
+  int int_status, send_pkts;
 
   DODEBUG(Start_End, printf("exintr%d: start\n", unit););
 
@@ -871,7 +869,6 @@ int ex_ioctl(register struct ifnet *ifp, int cmd, caddr_t data)
 void ex_reset(int unit)
 {
   struct ex_softc *sc = &ex_sc[unit];
-  struct ifnet *ifp = &sc->arpcom.ac_if;
   int s;
 
   DODEBUG(Start_End, printf("ex_reset%d: start\n", unit););
@@ -889,7 +886,6 @@ void ex_reset(int unit)
 
 void ex_watchdog(struct ifnet *ifp)
 {
-  struct ex_softc *sc = &ex_sc[ifp->if_unit];
 
   DODEBUG(Start_End, printf("ex_watchdog%d: start\n", ifp->if_unit););
 
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 1353411..fbdc2e6 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.32 1997/10/26 21:08:41 nate Exp $
+ * $Id: if_fe.c,v 1.33 1997/10/29 15:54:19 nate Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -1128,7 +1128,7 @@ fe_init_ati ( struct fe_softc * sc )
 static int
 fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
 {
-	int i,type;
+	int i;
 
 	static struct fe_simple_probe_struct probe_table [] = {
 		{ FE_DLCR2, 0x70, 0x00 },
@@ -1680,7 +1680,7 @@ static void
 fe_init ( int unit )
 {
 	struct fe_softc *sc = &fe_softc[unit];
-	int i, s;
+	int s;
 
 #if FE_DEBUG >= 3
 	fe_dump( LOG_INFO, sc, "init()" );
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 6abdfaa..b1356af 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.28 1997/07/20 11:14:53 bde Exp $ */
+/* $Id: matcd.c,v 1.29 1997/09/21 21:42:18 gibbs Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
@@ -2516,8 +2516,6 @@ static int matcd_toc_entry(int ldrive, int cdrive, int controller,
 			     struct ioc_read_toc_single_entry * ioc_entry)
 {
 	struct	matcd_data *cd;
-	struct	cd_toc_entry *from;
-	struct	cd_toc_entry *to;
 	int	trk,origtrk,i,z,port;
 	unsigned char cmd[MAXCMDSIZ];
 	unsigned char data[5];
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 8f85db6..377f589 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.93 1997/07/20 14:10:06 bde Exp $
+ *	$Id: mcd.c,v 1.94 1997/09/21 21:41:26 gibbs Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -187,7 +187,9 @@ static	int	mcd_subchan(int unit, struct ioc_read_subchannel *sc);
 static	int	mcd_toc_header(int unit, struct ioc_toc_header *th);
 static	int	mcd_read_toc(int unit);
 static  int     mcd_toc_entrys(int unit, struct ioc_read_toc_entry *te);
+#if 0
 static  int     mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te);
+#endif
 static	int	mcd_stop(int unit);
 static  int     mcd_eject(int unit);
 static  int     mcd_inject(int unit);
@@ -1421,6 +1423,7 @@ mcd_read_toc(int unit)
 	return 0;
 }
 
+#if 0
 static int
 mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te)
 {
@@ -1471,6 +1474,7 @@ mcd_toc_entry(int unit, struct ioc_read_toc_single_entry *te)
 	}
 	return 0;
 }
+#endif
 
 static int
 mcd_toc_entrys(int unit, struct ioc_read_toc_entry *te)
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index ef11885..dff8ced 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -19,7 +19,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.42 1997/09/14 03:19:13 peter Exp $
+ * $Id: psm.c,v 1.43 1997/10/19 10:44:29 yokota Exp $
  */
 
 /*
@@ -342,7 +342,6 @@ static int
 get_mouse_buttons(KBDC kbdc)
 {
     int c = 2;		/* assume two buttons by default */
-    int res;
     int status[3];
 
     /*
@@ -373,12 +372,12 @@ get_mouse_buttons(KBDC kbdc)
 static int
 is_a_mouse(int id)
 {
+#if 0
     static int valid_ids[] = {
         PSM_MOUSE_ID,		/* mouse */
         PSM_BALLPOINT_ID,	/* ballpoint device */
         -1			/* end of table */
     };
-#if 0
     int i;
 
     for (i = 0; valid_ids[i] >= 0; ++i)
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index cdca487..7f6d409 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.235 1997/10/23 03:23:49 yokota Exp $
+ *  $Id: syscons.c,v 1.236 1997/10/26 07:36:13 yokota Exp $
  */
 
 #include "sc.h"
@@ -595,7 +595,6 @@ sckbdprobe(int unit, int flags)
 	goto fail;
     }
 
-succeed: 
     kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
     kbdc_lock(sc_kbdc, FALSE);
     return TRUE;
@@ -3451,7 +3450,6 @@ static void
 set_keyboard(int command, int data)
 {
     int s;
-    int c;
 
     if (sc_kbdc == NULL)
 	return;
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index 1932cb0..d23ca34 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -13,7 +13,7 @@
  * all derivative works or modified versions.
  *
  * From: Version 1.9, Mon Oct  9 20:27:42 MSK 1995
- * $Id: wcd.c,v 1.46 1997/10/29 22:11:00 sos Exp $
+ * $Id: wcd.c,v 1.47 1997/11/05 21:32:00 sos Exp $
  */
 
 #include "wdc.h"
@@ -344,7 +344,7 @@ wcdattach (struct atapi *ata, int unit, struct atapi_params *ap, int debug)
 	struct wcd *cdp;
 	struct atapires result;
 	struct changer *chp;
-	int lun, i;
+	int i;
 
 	if (wcdnlun >= NUNIT) {
 		printf ("wcd: too many units\n");
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index cfdd213..32910d2 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.141 1997/10/12 16:22:01 sos Exp $
+ *	$Id: wd.c,v 1.142 1997/11/04 09:28:54 phk Exp $
  */
 
 /* TODO:
@@ -279,7 +279,6 @@ static int
 wdprobe(struct isa_device *dvp)
 {
 	int	unit = dvp->id_unit;
-	void	*cookie;
 	int	interface;
 	struct disk *du;
 
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index cdca487..7f6d409 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.235 1997/10/23 03:23:49 yokota Exp $
+ *  $Id: syscons.c,v 1.236 1997/10/26 07:36:13 yokota Exp $
  */
 
 #include "sc.h"
@@ -595,7 +595,6 @@ sckbdprobe(int unit, int flags)
 	goto fail;
     }
 
-succeed: 
     kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
     kbdc_lock(sc_kbdc, FALSE);
     return TRUE;
@@ -3451,7 +3450,6 @@ static void
 set_keyboard(int command, int data)
 {
     int s;
-    int c;
 
     if (sc_kbdc == NULL)
 	return;
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index cf36e92..2f7baef 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.18 1997/09/10 19:43:15 phk Exp $
+ * $Id: cd9660_lookup.c,v 1.19 1997/10/16 10:47:33 phk Exp $
  */
 
 #include <sys/param.h>
@@ -117,7 +117,6 @@ cd9660_lookup(ap)
 	char *name;
 	struct vnode **vpp = ap->a_vpp;
 	struct componentname *cnp = ap->a_cnp;
-	struct ucred *cred = cnp->cn_cred;
 	int flags = cnp->cn_flags;
 	int nameiop = cnp->cn_nameiop;
 	struct proc *p = cnp->cn_proc;
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index d3db4a1..4bc152e 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.30 1997/10/12 20:23:38 phk Exp $
+ * $Id: cd9660_vfsops.c,v 1.31 1997/10/16 10:47:43 phk Exp $
  */
 
 #include <sys/param.h>
@@ -269,7 +269,7 @@ iso_mountfs(devvp, mp, p, argp)
 	int ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
 	int iso_bsize;
 	int iso_blknum;
-	struct iso_volume_descriptor *vdp;
+	struct iso_volume_descriptor *vdp = 0;
 	struct iso_primary_descriptor *pri;
 	struct iso_sierra_primary_descriptor *pri_sierra;
 	struct iso_directory_record *rootp;
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 3c2ae5b..9ca823c 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.72 1997/09/21 22:00:03 gibbs Exp $
+ * $Id: init_main.c,v 1.73 1997/11/06 19:29:07 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -588,7 +588,7 @@ start_init(p)
 {
 	vm_offset_t addr;
 	struct execve_args args;
-	int options, i, retval[2], error;
+	int options, i, error;
 	char **pathp, *path, *ucp, **uap, *arg0, *arg1;
 
 	initproc = p;
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index f1b30b5..0cbe918 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.41 1997/09/21 22:00:07 gibbs Exp $
+ * $Id: kern_clock.c,v 1.42 1997/09/24 16:39:16 gibbs Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -454,7 +454,6 @@ void
 hardclock(frame)
 	register struct clockframe *frame;
 {
-	register struct callout *p1;
 	register struct proc *p;
 
 	p = curproc;
@@ -809,7 +808,6 @@ untimeout(ftn, arg, handle)
 	void *arg;
 	struct callout_handle handle;
 {
-	register struct callout *p, *t;
 	register int s;
 
 	/*
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 4d0e4de..c14cc93 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_lock.c	8.18 (Berkeley) 5/21/95
- * $Id: kern_lock.c,v 1.12 1997/09/21 04:22:52 dyson Exp $
+ * $Id: kern_lock.c,v 1.13 1997/10/28 15:58:19 bde Exp $
  */
 
 #include <sys/param.h>
@@ -124,7 +124,6 @@ apause(struct lock *lkp, int flags) {
 static int
 acquire(struct lock *lkp, int extflags, int wanted) {
 	int error;
-	int lock_wait;
 
 	if ((extflags & LK_NOWAIT) && (lkp->lk_flags & wanted)) {
 		return EBUSY;
@@ -379,7 +378,6 @@ lockmgr(lkp, flags, interlkp, p)
 static int
 acquiredrain(struct lock *lkp, int extflags) {
 	int error;
-	int lock_wait;
 
 	if ((extflags & LK_NOWAIT) && (lkp->lk_flags & LK_ALL)) {
 		return EBUSY;
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 80a8f14..b0fe29a 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_module.c,v 1.4 1997/10/28 15:58:21 bde Exp $
+ *	$Id: kern_module.c,v 1.5 1997/11/06 19:29:11 phk Exp $
  */
 
 #include <sys/param.h>
@@ -70,7 +70,6 @@ static void
 module_shutdown(int arg1, void* arg2)
 {
     module_t mod;
-    int error;
 
     for (mod = TAILQ_FIRST(&modules); mod; mod = TAILQ_NEXT(mod, link))
 	MOD_EVENT(mod, MOD_SHUTDOWN);
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index d97b0c9..102de12 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.26 1997/08/26 00:20:11 bde Exp $
+ * $Id: kern_resource.c,v 1.27 1997/11/06 19:29:13 phk Exp $
  */
 
 #include "opt_rlimit.h"
@@ -75,7 +75,7 @@ getpriority(curp, uap)
 	struct proc *curp;
 	register struct getpriority_args *uap;
 {
-	register struct proc *p;
+	register struct proc *p = 0;
 	register int low = PRIO_MAX + 1;
 
 	switch (uap->which) {
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index f1b30b5..0cbe918 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.41 1997/09/21 22:00:07 gibbs Exp $
+ * $Id: kern_clock.c,v 1.42 1997/09/24 16:39:16 gibbs Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -454,7 +454,6 @@ void
 hardclock(frame)
 	register struct clockframe *frame;
 {
-	register struct callout *p1;
 	register struct proc *p;
 
 	p = curproc;
@@ -809,7 +808,6 @@ untimeout(ftn, arg, handle)
 	void *arg;
 	struct callout_handle handle;
 {
-	register struct callout *p, *t;
 	register int s;
 
 	/*
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index 37b1461..d618aad 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,7 +46,7 @@
  * in Germany will I accept domestic beer.  This code may or may not work
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
- * $Id: kern_threads.c,v 1.3 1997/09/02 20:05:44 bde Exp $
+ * $Id: kern_threads.c,v 1.4 1997/11/06 19:29:16 phk Exp $
  */
 
 #include <sys/param.h>
@@ -70,7 +70,7 @@ int
 thr_sleep(struct proc *p, struct thr_sleep_args *uap) {
 	int sleepstart;
 	struct timespec ts;
-	struct timeval atv, utv;
+	struct timeval atv;
 	int error, s, timo;
 
 	timo = 0;
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 57d498e..8060c15 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.38 1997/10/26 20:26:28 phk Exp $
+ * $Id: kern_time.c,v 1.39 1997/11/06 19:29:16 phk Exp $
  */
 
 #include <sys/param.h>
@@ -333,7 +333,6 @@ signanosleep(p, uap)
 {
 	struct timespec rmt, rqt;
 	int error, error2;
-	struct sigacts *ps = p->p_sigacts;
 	sigset_t mask;
 
 	error = copyin(SCARG(uap, rqtp), &rqt, sizeof(rqt));
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index f1b30b5..0cbe918 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.41 1997/09/21 22:00:07 gibbs Exp $
+ * $Id: kern_clock.c,v 1.42 1997/09/24 16:39:16 gibbs Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -454,7 +454,6 @@ void
 hardclock(frame)
 	register struct clockframe *frame;
 {
-	register struct callout *p1;
 	register struct proc *p;
 
 	p = curproc;
@@ -809,7 +808,6 @@ untimeout(ftn, arg, handle)
 	void *arg;
 	struct callout_handle handle;
 {
-	register struct callout *p, *t;
 	register int s;
 
 	/*
diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index 0d60384..4fbd5cd 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_aout.c,v 1.2 1997/08/02 14:31:35 bde Exp $
+ *	$Id: link_aout.c,v 1.3 1997/10/24 05:29:07 jmg Exp $
  */
 
 #include <sys/param.h>
@@ -101,12 +101,9 @@ static int
 link_aout_load_file(const char* filename, linker_file_t* result)
 {
     struct nameidata nd;
-    struct vnode* file;
     struct proc* p = curproc;	/* XXX */
     int error = 0;
     int resid;
-    struct iovec aiov;
-    struct uio auio;
     struct exec header;
     aout_file_t af;
     linker_file_t lf;
@@ -370,7 +367,6 @@ link_aout_lookup_symbol(linker_file_t file, const char* name,
 			caddr_t* address, size_t* size)
 {
     aout_file_t af = file->priv;
-    int buckets;
     long hashval;
     struct rrs_hash* hashbase;
     struct nzlist* symbolbase;
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index 0ca4f47..c87355c 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.31 1997/07/13 15:53:20 bde Exp $
+ * $Id: ufs_disksubr.c,v 1.32 1997/09/21 22:10:49 gibbs Exp $
  */
 
 #include <sys/param.h>
@@ -69,7 +69,6 @@ bufqdisksort(bufq, bp)
 {
 	struct buf *bq;
 	struct buf *bn;
-	int	    count;
 	
 	/*
 	 * If the queue is empty or we are an
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 5821505..aaae9b3 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.34 1997/10/06 08:30:08 peter Exp $
+ * $Id: sys_pipe.c,v 1.35 1997/11/06 19:29:21 phk Exp $
  */
 
 /*
@@ -238,7 +238,6 @@ static void
 pipeinit(cpipe)
 	struct pipe *cpipe;
 {
-	int s;
 
 	cpipe->pipe_buffer.in = 0;
 	cpipe->pipe_buffer.out = 0;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 2bf7f20..d1b708a 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.96 1997/09/14 02:40:44 peter Exp $
+ * $Id: tty.c,v 1.97 1997/10/12 20:24:05 phk Exp $
  */
 
 /*-
@@ -1486,7 +1486,6 @@ loop:
 		int m = cc[VMIN];
 		long t = cc[VTIME];
 		struct timeval stime, timecopy;
-		int x;
 
 		/*
 		 * Check each of the four combinations.
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index bbf41bf..dafb5d9 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.27 1997/09/14 02:52:18 peter Exp $
+ *	$Id: uipc_usrreq.c,v 1.28 1997/10/12 20:24:18 phk Exp $
  */
 
 #include <sys/param.h>
@@ -450,7 +450,6 @@ static int
 unp_attach(so)
 	struct socket *so;
 {
-	register struct mbuf *m;
 	register struct unpcb *unp;
 	int error;
 
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 493de18..6625dab 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.8 1997/10/12 20:24:19 phk Exp $
+ * $Id: vfs_aio.c,v 1.9 1997/11/06 19:29:27 phk Exp $
  */
 
 /*
@@ -469,7 +469,6 @@ aio_startproc(void *uproc)
 	while(1) {
 		struct vmspace *myvm, *tmpvm;
 		struct proc *cp = curproc;
-		struct proc *up = NULL;
 		struct	aiocblist *aiocbe;
 
 		if ((aiop->aioprocflags & AIOP_FREE) == 0) {
@@ -830,7 +829,6 @@ aio_return(struct proc *p, struct aio_return_args *uap) {
 	int jobref, status;
 	struct aiocblist *cb;
 	struct kaioinfo *ki;
-	struct proc *userp;
 
 	ki = p->p_aioinfo;
 	if (ki == NULL) {
@@ -906,7 +904,7 @@ aio_marksuspend(struct proc *p, int njobs, int *joblist, int set) {
  */
 int
 aio_suspend(struct proc *p, struct aio_suspend_args *uap) {
-	struct timeval atv, utv;
+	struct timeval atv;
 	struct timespec ts;
 	struct aiocb *const *cbptr, *cbp;
 	struct kaioinfo *ki;
@@ -1036,11 +1034,10 @@ aio_cancel(struct proc *p, struct aio_cancel_args *uap) {
  */
 int
 aio_error(struct proc *p, struct aio_error_args *uap) {
-	int activeflag, errorcode;
 	struct aiocblist *cb;
 	struct kaioinfo *ki;
 	int jobref;
-	int error, status;
+	int status;
 
 	ki = p->p_aioinfo;
 	if (ki == NULL)
@@ -1230,7 +1227,7 @@ aio_write(struct proc *p, struct aio_write_args *uap) {
 
 int
 lio_listio(struct proc *p, struct lio_listio_args *uap) {
-	int cnt, nent, nentqueued;
+	int nent, nentqueued;
 	struct aiocb *iocb, * const *cbptr;
 	struct aiocblist *cb;
 	struct kaioinfo *ki;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index b9d1335..72a2761 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.132 1997/10/28 15:58:24 bde Exp $
+ * $Id: vfs_bio.c,v 1.133 1997/11/06 19:29:29 phk Exp $
  */
 
 /*
@@ -1278,7 +1278,6 @@ getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo)
 	int s;
 	struct bufhashhdr *bh;
 	int maxsize;
-	static pid_t flushing = 0;
 
 	if (vp->v_mount) {
 		maxsize = vp->v_mount->mnt_stat.f_iosize;
@@ -2091,7 +2090,6 @@ vfs_clean_pages(struct buf * bp)
 
 	if (bp->b_flags & B_VMIO) {
 		struct vnode *vp = bp->b_vp;
-		vm_object_t obj = vp->v_object;
 		vm_ooffset_t foff;
 
 		if (vp->v_type == VBLK)
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 3d76d4f..ec72155 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.5 (Berkeley) 3/22/95
- * $Id: vfs_cache.c,v 1.34 1997/10/15 13:22:52 phk Exp $
+ * $Id: vfs_cache.c,v 1.35 1997/10/16 10:47:54 phk Exp $
  */
 
 #include <sys/param.h>
@@ -156,8 +156,7 @@ cache_lookup(dvp, vpp, cnp)
 	struct vnode **vpp;
 	struct componentname *cnp;
 {
-	register struct namecache *ncp, *nnp;
-	register struct nchashhead *ncpp;
+	register struct namecache *ncp;
 
 	if (!doingcache) {
 		cnp->cn_flags &= ~MAKEENTRY;
@@ -331,8 +330,6 @@ void
 cache_purge(vp)
 	struct vnode *vp;
 {
-	struct namecache *ncp;
-	struct nchashhead *ncpp;
 	static u_long nextid;
 
 	while (!LIST_EMPTY(&vp->v_cache_src)) 
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 304d4d3..1fff926 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.47 1997/06/15 17:56:49 dyson Exp $
+ * $Id: vfs_cluster.c,v 1.48 1997/08/02 14:31:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -85,7 +85,7 @@ cluster_read(vp, filesize, lblkno, size, cred, totread, seqcount, bpp)
 	struct buf **bpp;
 {
 	struct buf *bp, *rbp, *reqbp;
-	daddr_t blkno, rablkno, origblkno;
+	daddr_t blkno, origblkno;
 	int error, num_ra;
 	int i;
 	int maxra, racluster;
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 0e65cab..6aac763 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.15 1997/10/12 20:24:23 phk Exp $
+ * $Id: vfs_conf.c,v 1.16 1997/10/16 07:32:14 julian Exp $
  */
 
 /*
@@ -145,8 +145,6 @@ error_2:	/* mount error*/
 
 	vfs_unbusy(mp, p);
 
-error_1:	/* lock error*/
-
 	/* free mount struct before failing*/
 	free( mp, M_MOUNT);
 
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index ebc4dc3..412bb88 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.110 1997/10/12 20:24:26 phk Exp $
+ * $Id: vfs_subr.c,v 1.111 1997/10/26 20:55:07 phk Exp $
  */
 
 /*
@@ -650,7 +650,6 @@ void
 pbrelvp(bp)
 	register struct buf *bp;
 {
-	struct vnode *vp;
 
 #if defined(DIAGNOSTIC)
 	if (bp->b_vp == (struct vnode *) 0)
@@ -1626,6 +1625,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
 int kinfo_vdebug = 1;
 int kinfo_vgetfailed;
 
+#if 0
 #define KINFO_VNODESLOP	10
 /*
  * Dump vnode list (via sysctl).
@@ -1686,6 +1686,7 @@ again:
 
 	return (0);
 }
+#endif
 
 /*
  * XXX
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 0e65cab..6aac763 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.15 1997/10/12 20:24:23 phk Exp $
+ * $Id: vfs_conf.c,v 1.16 1997/10/16 07:32:14 julian Exp $
  */
 
 /*
@@ -145,8 +145,6 @@ error_2:	/* mount error*/
 
 	vfs_unbusy(mp, p);
 
-error_1:	/* lock error*/
-
 	/* free mount struct before failing*/
 	free( mp, M_MOUNT);
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ebc4dc3..412bb88 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.110 1997/10/12 20:24:26 phk Exp $
+ * $Id: vfs_subr.c,v 1.111 1997/10/26 20:55:07 phk Exp $
  */
 
 /*
@@ -650,7 +650,6 @@ void
 pbrelvp(bp)
 	register struct buf *bp;
 {
-	struct vnode *vp;
 
 #if defined(DIAGNOSTIC)
 	if (bp->b_vp == (struct vnode *) 0)
@@ -1626,6 +1625,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
 int kinfo_vdebug = 1;
 int kinfo_vgetfailed;
 
+#if 0
 #define KINFO_VNODESLOP	10
 /*
  * Dump vnode list (via sysctl).
@@ -1686,6 +1686,7 @@ again:
 
 	return (0);
 }
+#endif
 
 /*
  * XXX
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 19f35b0..c5be2e4 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.39 1997/10/06 02:38:27 dyson Exp $
+ * $Id: vfs_vnops.c,v 1.40 1997/10/27 15:26:23 bde Exp $
  */
 
 #include <sys/param.h>
@@ -272,7 +272,7 @@ vn_read(fp, uio, cred)
 	struct vnode *vp = (struct vnode *)fp->f_data;
 	struct proc *p = uio->uio_procp;
 	int count, error;
-	int flag, seq;
+	int flag;
 
 	VOP_LEASE(vp, p, cred, LEASE_READ);
 	vn_lock(vp, LK_SHARED | LK_NOPAUSE | LK_RETRY, p);
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index ef82b11..b9fc5b2 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.40 1997/10/27 13:33:41 bde Exp $
+ *	$Id: procfs_vnops.c,v 1.41 1997/10/27 15:39:01 bde Exp $
  */
 
 /*
@@ -590,7 +590,6 @@ procfs_lookup(ap)
 	struct vnode *dvp = ap->a_dvp;
 	char *pname = cnp->cn_nameptr;
 	struct proc *curp = cnp->cn_proc;
-	int error = 0;
 	struct proc_target *pt;
 	struct vnode *fvp;
 	pid_t pid;
@@ -775,7 +774,6 @@ procfs_readdir(ap)
 		int pcnt = 0;
 		volatile struct proc *p = allproc.lh_first;
 
-	again:
 		for (; p && uio->uio_resid >= UIO_MX; i++, pcnt++) {
 			bzero((char *) dp, UIO_MX);
 			dp->d_reclen = UIO_MX;
@@ -846,7 +844,6 @@ static int
 procfs_readlink(ap)
 	struct vop_readlink_args *ap;
 {
-	struct uio *uio = ap->a_uio;
 	char buf[16];		/* should be enough */
 	int len;
 
diff --git a/sys/net/hostcache.c b/sys/net/hostcache.c
index 78f4408..1c9cee8 100644
--- a/sys/net/hostcache.c
+++ b/sys/net/hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hostcache.c,v 1.1 1997/06/18 01:24:21 wollman Exp $
+ *	$Id: hostcache.c,v 1.2 1997/10/12 20:25:06 phk Exp $
  */
 
 #include <sys/param.h>
@@ -182,7 +182,6 @@ int
 hc_delete(struct hcentry *hc)
 {
 	struct hctable *hct;
-	u_long hash;
 	int error, s;
 
 	if (hc->hc_refcnt > 0)
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 190fd47..7d90fab 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.37 1997/10/28 15:58:31 bde Exp $
+ * $Id: if_ethersubr.c,v 1.38 1997/10/29 00:30:43 julian Exp $
  */
 
 #include <sys/param.h>
@@ -118,14 +118,13 @@ ether_output(ifp, m0, dst, rt0)
 {
 	short type;
 	int s, error = 0;
- 	u_char *cp, edst[6];
-	register struct mbuf *m2, *m = m0;
+ 	u_char edst[6];
+	register struct mbuf *m = m0;
 	register struct rtentry *rt;
 	struct mbuf *mcopy = (struct mbuf *)0;
 	register struct ether_header *eh;
 	int off, len = m->m_pkthdr.len;
 	struct arpcom *ac = (struct arpcom *)ifp;
-	register struct ifqueue *inq;
 #ifdef NETATALK
 	struct at_ifaddr *aa;
 #endif NETATALK
@@ -459,7 +458,7 @@ ether_input(ifp, eh, m)
 	struct mbuf *m;
 {
 	register struct ifqueue *inq;
-	u_short ether_type, *checksum;
+	u_short ether_type;
 	int s;
 #if defined (ISO) || defined (LLC) || defined(NETATALK)
 	register struct llc *l;
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 8d2d001..348bb85 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- *	$Id: raw_usrreq.c,v 1.14 1997/08/16 19:15:27 wollman Exp $
+ *	$Id: raw_usrreq.c,v 1.15 1997/09/14 03:10:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -211,7 +211,6 @@ static int
 raw_upeeraddr(struct socket *so, struct sockaddr **nam)
 {
 	struct rawcb *rp = sotorawcb(so);
-	unsigned len;
 
 	if (rp == 0)
 		return EINVAL;
@@ -283,7 +282,6 @@ static int
 raw_usockaddr(struct socket *so, struct sockaddr **nam)
 {
 	struct rawcb *rp = sotorawcb(so);
-	unsigned len;
 
 	if (rp == 0)
 		return EINVAL;
diff --git a/sys/netinet/in_hostcache.c b/sys/netinet/in_hostcache.c
index 8b46959..a3f08b6 100644
--- a/sys/netinet/in_hostcache.c
+++ b/sys/netinet/in_hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: in_hostcache.c,v 1.1 1997/06/18 01:24:28 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -151,7 +151,6 @@ static struct hccallback inhc_cb = {
 int
 inhc_init(void)
 {
-	int error;
 
 	return (hc_init(AF_INET, &inhc_cb, 128, 0));
 }
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index d87482c..9785551 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.63 1997/10/02 02:10:40 davidg Exp $
+ *	$Id: tcp_input.c,v 1.64 1997/10/28 15:58:52 bde Exp $
  */
 
 #include "opt_tcpdebug.h"
@@ -623,7 +623,6 @@ findpcb:
 	 * segment in this state.
 	 */
 	case TCPS_LISTEN: {
-		struct mbuf *am;
 		register struct sockaddr_in *sin;
 
 		if (tiflags & TH_RST)
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index d87482c..9785551 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.63 1997/10/02 02:10:40 davidg Exp $
+ *	$Id: tcp_input.c,v 1.64 1997/10/28 15:58:52 bde Exp $
  */
 
 #include "opt_tcpdebug.h"
@@ -623,7 +623,6 @@ findpcb:
 	 * segment in this state.
 	 */
 	case TCPS_LISTEN: {
-		struct mbuf *am;
 		register struct sockaddr_in *sin;
 
 		if (tiflags & TH_RST)
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index a482b58..7820a81 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $
+ * $Id: nfs_subs.c,v 1.46 1997/10/28 15:59:08 bde Exp $
  */
 
 /*
@@ -1216,7 +1216,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 	struct timespec mtime;
 	struct vnode *nvp;
 	int v3 = NFS_ISV3(vp);
-	struct proc *p = curproc;
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index ce2a34e..f4b74ca 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
- * $Id: nfs_nqlease.c,v 1.30 1997/10/12 20:25:41 phk Exp $
+ * $Id: nfs_nqlease.c,v 1.31 1997/10/28 15:59:03 bde Exp $
  */
 
 
@@ -644,7 +644,6 @@ nqnfs_serverd()
 	register struct nqhost *lph;
 	struct nqlease *nextlp;
 	struct nqm *lphnext, *olphnext;
-	struct mbuf *n;
 	int i, len, ok;
 
 	for (lp = nqtimerhead.cqh_first; lp != (void *)&nqtimerhead;
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index a482b58..7820a81 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $
+ * $Id: nfs_subs.c,v 1.46 1997/10/28 15:59:08 bde Exp $
  */
 
 /*
@@ -1216,7 +1216,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 	struct timespec mtime;
 	struct vnode *nvp;
 	int v3 = NFS_ISV3(vp);
-	struct proc *p = curproc;
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 6821386..074a008 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.30 1997/10/28 15:59:11 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.31 1997/11/06 19:29:42 phk Exp $
  */
 
 #include <sys/param.h>
@@ -604,7 +604,6 @@ nfssvc_nfsd(nsd, argp, p)
 		    } else if (nfs_privport) {
 			/* Check if source port is privileged */
 			u_short port;
-			u_long  addr;
 			struct sockaddr *nam = nd->nd_nam;
 			struct sockaddr_in *sin;
 
@@ -757,11 +756,10 @@ static int
 nfssvc_iod(p)
 	struct proc *p;
 {
-	register struct buf *bp, *nbp;
+	register struct buf *bp;
 	register int i, myiod;
-	struct vnode *vp;
 	struct nfsmount *nmp;
-	int error = 0, s;
+	int error = 0;
 
 	/*
 	 * Assign my position or return error if too many already running
@@ -842,7 +840,6 @@ nfsrv_zapsock(slp)
 	register struct nfsrv_descript *nwp, *nnwp;
 	struct socket *so;
 	struct file *fp;
-	struct mbuf *m;
 	struct nfsrv_rec *rec;
 	int s;
 
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 6821386..074a008 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.30 1997/10/28 15:59:11 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.31 1997/11/06 19:29:42 phk Exp $
  */
 
 #include <sys/param.h>
@@ -604,7 +604,6 @@ nfssvc_nfsd(nsd, argp, p)
 		    } else if (nfs_privport) {
 			/* Check if source port is privileged */
 			u_short port;
-			u_long  addr;
 			struct sockaddr *nam = nd->nd_nam;
 			struct sockaddr_in *sin;
 
@@ -757,11 +756,10 @@ static int
 nfssvc_iod(p)
 	struct proc *p;
 {
-	register struct buf *bp, *nbp;
+	register struct buf *bp;
 	register int i, myiod;
-	struct vnode *vp;
 	struct nfsmount *nmp;
-	int error = 0, s;
+	int error = 0;
 
 	/*
 	 * Assign my position or return error if too many already running
@@ -842,7 +840,6 @@ nfsrv_zapsock(slp)
 	register struct nfsrv_descript *nwp, *nnwp;
 	struct socket *so;
 	struct file *fp;
-	struct mbuf *m;
 	struct nfsrv_rec *rec;
 	int s;
 
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index a482b58..7820a81 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $
+ * $Id: nfs_subs.c,v 1.46 1997/10/28 15:59:08 bde Exp $
  */
 
 /*
@@ -1216,7 +1216,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 	struct timespec mtime;
 	struct vnode *nvp;
 	int v3 = NFS_ISV3(vp);
-	struct proc *p = curproc;
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index a482b58..7820a81 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $
+ * $Id: nfs_subs.c,v 1.46 1997/10/28 15:59:08 bde Exp $
  */
 
 /*
@@ -1216,7 +1216,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 	struct timespec mtime;
 	struct vnode *nvp;
 	int v3 = NFS_ISV3(vp);
-	struct proc *p = curproc;
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 6821386..074a008 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.30 1997/10/28 15:59:11 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.31 1997/11/06 19:29:42 phk Exp $
  */
 
 #include <sys/param.h>
@@ -604,7 +604,6 @@ nfssvc_nfsd(nsd, argp, p)
 		    } else if (nfs_privport) {
 			/* Check if source port is privileged */
 			u_short port;
-			u_long  addr;
 			struct sockaddr *nam = nd->nd_nam;
 			struct sockaddr_in *sin;
 
@@ -757,11 +756,10 @@ static int
 nfssvc_iod(p)
 	struct proc *p;
 {
-	register struct buf *bp, *nbp;
+	register struct buf *bp;
 	register int i, myiod;
-	struct vnode *vp;
 	struct nfsmount *nmp;
-	int error = 0, s;
+	int error = 0;
 
 	/*
 	 * Assign my position or return error if too many already running
@@ -842,7 +840,6 @@ nfsrv_zapsock(slp)
 	register struct nfsrv_descript *nwp, *nnwp;
 	struct socket *so;
 	struct file *fp;
-	struct mbuf *m;
 	struct nfsrv_rec *rec;
 	int s;
 
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index b3a301f..0045b8b 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: wd82371.c,v 1.5.2.1 1996/11/16 21:19:51 phk Exp $
+ *	$Id: ide_pci.c,v 1.4 1997/09/20 07:41:55 dyson Exp $
  */
 
 #include "pci.h"
@@ -157,7 +157,6 @@ static int ide_pci_dmasetup(void *, char *, u_long, int);
 static void ide_pci_dmastart(void *);
 static int ide_pci_dmadone(void *);
 static int ide_pci_status(void *);
-static int ide_pci_timing(void *, int);
 static int ide_pci_iobase(void *xcp);
 static int ide_pci_altiobase(void *xcp);
 
@@ -484,7 +483,7 @@ static void
 promise_status(struct ide_pci_cookie *cookie)
 {
     pcici_t tag;
-    int i,j;
+    int i;
     u_int32_t port0_command, port0_altstatus;
     u_int32_t port1_command, port1_altstatus;
     u_int32_t dma_block;
@@ -930,7 +929,6 @@ ide_pci_probe(pcici_t tag, pcidi_t type)
 static void
 ide_pci_attach(pcici_t tag, int unit)
 {
-	u_long idetm;
 	u_long class, cmd;
 	int bmista_1, bmista_2;
 	int iobase_wd_1, iobase_wd_2, iobase_bm_1, iobase_bm_2;
@@ -1031,7 +1029,7 @@ ide_pci:  giving up\n");
 	 * addresses, from a PCI device to an ISA probe.  Sorry :-).
 	 */
 	if (iobase_wd_1 != IO_WD1) {
-	    struct isa_device *dvp, *dvp1, *dvup, *dvup1;
+	    struct isa_device *dvp, *dvp1, *dvup;
 	    for( dvp = isa_devtab_bio;
 			dvp->id_id != 0;
 			dvp++) {
@@ -1261,8 +1259,6 @@ ide_pci_dmasetup(void *xcp, char *vaddr, u_long vcount, int dir)
 	u_long prd_base, prd_count;
 	u_long nbase, ncount, nend;
 	int iobase_bm;
-	static int trashmore = 0xdeadbeef;
-	static int *trashmore_p = 0;
 	u_long count, checkcount;
 
 	prd = cp->prd;
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 468ec05..f94498d 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.78 1997/08/02 14:33:12 bde Exp $
+ * $Id: pci.c,v 1.79 1997/09/14 03:19:36 peter Exp $
  *
  */
 
@@ -357,6 +357,7 @@ pci_readcfg(pcicfgregs *probe)
 	return (cfg);
 }
 
+#if 0
 /* free pcicfgregs structure and all depending data structures */
 
 static int
@@ -369,6 +370,7 @@ pci_freecfg(pcicfgregs *cfg)
 	free(cfg, M_DEVBUF);
 	return (0);
 }
+#endif
 
 static void
 pci_addcfg(pcicfgregs *cfg)
@@ -491,9 +493,7 @@ pci_close(dev_t dev, int flag, int devtype, struct proc *p)
 static int
 pci_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 {
-	struct pci_conf_io *cio;
 	struct pci_io *io;
-	size_t iolen;
 	int error;
 
 	if (cmd != PCIOCGETCONF && !(flag & FWRITE))
diff --git a/sys/pci/tek390.c b/sys/pci/tek390.c
index b9283dd..9b4bcd2 100644
--- a/sys/pci/tek390.c
+++ b/sys/pci/tek390.c
@@ -123,7 +123,6 @@ static void DC390_InvalidCmd( PACB pACB );
  * XXX No timeouts are scheduled in this driver as the timeout handler
  *     doesn't do anything yet!!!
  */
-static void DC390_timeout( void *arg1);
 static void DC390_reset (PACB pACB);
 static PUCHAR  phystovirt( PSRB pSRB, ULONG xferCnt );
 
@@ -217,9 +216,7 @@ static PACB	pACB_current = NULL;
 static PDCB	pPrevDCB = NULL;
 static USHORT	adapterCnt = 0;
 static USHORT	CurrSyncOffset = 0;
-static USHORT	mech2Agent;
-static ULONG	mech1addr;
-static UCHAR	mech2bus, mech2CfgSPenR, CurrentID, CurrentLUN;
+static UCHAR	CurrentID, CurrentLUN;
 
 static PVOID DC390_phase0[]={
        DC390_DataOut_0,
@@ -984,15 +981,6 @@ DC390_reset (PACB pACB)
 }
 
 
-void
-DC390_timeout( void *arg1)
-{
-    PSRB  pSRB;
-
-    pSRB = (PSRB) arg1;
-}
-
-
 #include <pci/scsiiom.c>
 
 
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 49a18f8..bdeb5cc 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -15,7 +15,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.111 1997/09/21 22:03:14 gibbs Exp $
+ *      $Id: sd.c,v 1.112 1997/10/12 08:54:47 joerg Exp $
  */
 
 #include "opt_bounce.h"
@@ -68,7 +68,9 @@ static u_int32_t sdstrats, sdqueues;
  makedev(major(DEV), dkmakeminor((U), dkslice(DEV), dkpart(DEV)))
 
 static errval	sd_get_parms __P((int unit, int flags));
+#if 0
 static errval	sd_reassign_blocks __P((int unit, int block));
+#endif
 static u_int32_t	sd_size __P((int unit, int flags));
 static	void	sdstrategy1 __P((struct buf *));
 
@@ -727,6 +729,7 @@ sd_size(unit, flags)
 	return (size);
 }
 
+#if 0
 /*
  * Tell the device to map out a defective block
  */
@@ -759,6 +762,8 @@ sd_reassign_blocks(unit, block)
 		NULL,
 		SCSI_DATA_OUT));
 }
+#endif
+
 #define b2tol(a)	(((unsigned)(a##_1) << 8) + (unsigned)a##_0 )
 
 /*
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 7f8d84d..091a393 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
- * $Id: ffs_alloc.c,v 1.40 1997/10/16 10:49:19 phk Exp $
+ * $Id: ffs_alloc.c,v 1.41 1997/10/16 20:32:33 phk Exp $
  */
 
 #include "opt_quota.h"
@@ -60,8 +60,6 @@ static ufs_daddr_t ffs_alloccg __P((struct inode *, int, ufs_daddr_t, int));
 static ufs_daddr_t ffs_alloccgblk __P((struct fs *, struct cg *, ufs_daddr_t));
 static void	ffs_clusteracct	__P((struct fs *, struct cg *, ufs_daddr_t,
 				     int));
-static ufs_daddr_t ffs_clusteralloc __P((struct inode *, int, ufs_daddr_t,
-	    int));
 static ino_t	ffs_dirpref __P((struct fs *));
 static ufs_daddr_t ffs_fragextend __P((struct inode *, int, long, int, int));
 static void	ffs_fserr __P((struct fs *, u_int, char *));
@@ -335,8 +333,6 @@ SYSCTL_INT(_vfs_ffs, FFS_ASYNCFREE, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, ""
 int doreallocblks = 1;
 SYSCTL_INT(_vfs_ffs, FFS_REALLOCBLKS, doreallocblks, CTLFLAG_RW, &doreallocblks, 0, "");
 
-static int prtrealloc = 0;
-
 int
 ffs_reallocblks(ap)
 	struct vop_reallocblks_args /* {
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index 0ca4f47..c87355c 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.31 1997/07/13 15:53:20 bde Exp $
+ * $Id: ufs_disksubr.c,v 1.32 1997/09/21 22:10:49 gibbs Exp $
  */
 
 #include <sys/param.h>
@@ -69,7 +69,6 @@ bufqdisksort(bufq, bp)
 {
 	struct buf *bq;
 	struct buf *bn;
-	int	    count;
 	
 	/*
 	 * If the queue is empty or we are an
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 7ce32d4..fcf3e70 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.65 1997/08/21 20:33:42 bde Exp $
+ * $Id: vm_glue.c,v 1.66 1997/09/01 03:17:16 bde Exp $
  */
 
 #include "opt_rlimit.h"
@@ -205,8 +205,6 @@ vm_fork(p1, p2, flags)
 	int flags;
 {
 	register struct user *up;
-	int i;
-	pmap_t pvp;
 
 	if (flags & RFMEM) {
 		p2->p_vmspace = p1->p_vmspace;
@@ -285,7 +283,6 @@ void
 faultin(p)
 	struct proc *p;
 {
-	vm_offset_t i;
 	int s;
 
 	if ((p->p_flag & P_INMEM) == 0) {
@@ -458,8 +455,6 @@ static void
 swapout(p)
 	register struct proc *p;
 {
-	pmap_t pmap = &p->p_vmspace->vm_pmap;
-	int i;
 
 #if defined(SWAP_DEBUG)
 	printf("swapping out %d\n", p->p_pid);
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index e87c056..77755ed 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.94 1997/10/24 23:41:00 dyson Exp $
+ * $Id: vm_map.c,v 1.95 1997/10/28 15:59:26 bde Exp $
  */
 
 /*
@@ -152,7 +152,6 @@ static MALLOC_DEFINE(M_VMMAP, "VM map", "VM map structures");
 extern char kstack[];
 extern int inmprotect;
 
-static int kentry_count;
 static struct vm_zone kmapentzone_store, mapentzone_store, mapzone_store;
 static vm_zone_t mapentzone, kmapentzone, mapzone;
 static struct vm_object kmapentobj, mapentobj, mapobj;
@@ -1273,7 +1272,6 @@ vm_map_user_pageable(map, start, end, new_pageable)
 {
 	register vm_map_entry_t entry;
 	vm_map_entry_t start_entry;
-	register vm_offset_t failed = 0;
 	int rv;
 
 	vm_map_lock(map);