From 702c623a8a808303614b191707676909b9e40fbb Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 10 Oct 1994 01:12:27 +0000
Subject: [PATCH] Cosmetics.  Silence gcc -Wall.  Much more to do here :-(

---
 sys/dev/fdc/fdc.c      |  8 ++++----
 sys/i386/isa/aha1542.c | 12 +++++-------
 sys/i386/isa/fd.c      |  8 ++++----
 sys/i386/isa/fdc.h     |  4 ++--
 sys/i386/isa/lpt.c     |  5 ++---
 sys/isa/fd.c           |  8 ++++----
 sys/isa/fdc.h          |  4 ++--
 7 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index bb4caca4844..d825634cef5 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.31 1994/09/17 18:08:36 joerg Exp $
+ *	$Id: fd.c,v 1.32 1994/09/25 06:04:21 phk Exp $
  *
  */
 
@@ -718,8 +718,8 @@ fdstrategy(struct buf *bp)
 #endif
 	if (!(bp->b_flags & B_FORMAT)) {
 		if ((fdu >= NFD) || (bp->b_blkno < 0)) {
-			printf("fdstrat: fdu = %d, blkno = %d, bcount = %d\n",
-			       fdu, bp->b_blkno, bp->b_bcount);
+			printf("fdstrat: fdu = %d, blkno = %lu, bcount = %ld\n",
+			       fdu, (u_long)bp->b_blkno, bp->b_bcount);
 			bp->b_error = EINVAL;
 			bp->b_flags |= B_ERROR;
 			goto bad;
@@ -1255,7 +1255,7 @@ retrier(fdcu)
 			printf(" (ST0 %b ", fdc->status[0], NE7_ST0BITS);
 			printf(" ST1 %b ", fdc->status[1], NE7_ST1BITS);
 			printf(" ST2 %b ", fdc->status[2], NE7_ST2BITS);
-			printf("cyl %d hd %d sec %d)\n",
+			printf("cyl %ld hd %ld sec %ld)\n",
 			       fdc->status[3], fdc->status[4], fdc->status[5]);
 		}
 		bp->b_flags |= B_ERROR;
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 01bbb41c5b5..ab226c12c6a 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.34 1994/08/27 16:14:16 davidg Exp $
+ *      $Id: aha1542.c,v 1.35 1994/09/21 18:17:56 davidg Exp $
  */
 
 /*
@@ -356,6 +356,10 @@ static int ahaunit = 0;
 	outb(AHA_CMD_DATA_PORT, AHA_START_SCSI);
 
 #define AHA_RESET_TIMEOUT	2000	/* time to wait for reset (mSec) */
+
+int	aha_poll __P((int, struct scsi_xfer *, struct aha_ccb *));
+int	aha_init __P((int));
+
 #ifndef	KERNEL
 main()
 {
@@ -762,7 +766,6 @@ aha_done(unit, ccb)
 	int	unit;
 	struct	aha_ccb *ccb;
 {
-	struct aha_data *aha = ahadata[unit];
 	struct scsi_sense_data *s1, *s2;
 	struct scsi_xfer *xs = ccb->xfer;
 
@@ -1063,16 +1066,12 @@ aha_scsi_cmd(xs)
 	struct scsi_link *sc_link = xs->sc_link;
 	int     unit = sc_link->adapter_unit;
 	struct aha_data *aha = ahadata[unit];
-	struct scsi_sense_data *s1, *s2;
 	struct aha_ccb *ccb;
 	struct aha_scat_gath *sg;
 	int     seg;		/* scatter gather seg being worked on */
-	int     i = 0;
-	int     rc = 0;
 	int     thiskv;
 	int     thisphys, nextphys;
 	int     bytes_this_seg, bytes_this_page, datalen, flags;
-	struct iovec *iovp;
 	int     s;
 
 	SC_DEBUG(xs->sc_link, SDEV_DB2, ("aha_scsi_cmd\n"));
@@ -1243,7 +1242,6 @@ aha_poll(unit, xs, ccb)
 	struct aha_ccb *ccb;
 {
 	struct aha_data *aha = ahadata[unit];
-	int     done = 0;
 	int     count = xs->timeout;
 	u_char  stat;
 
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index bb4caca4844..d825634cef5 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.31 1994/09/17 18:08:36 joerg Exp $
+ *	$Id: fd.c,v 1.32 1994/09/25 06:04:21 phk Exp $
  *
  */
 
@@ -718,8 +718,8 @@ fdstrategy(struct buf *bp)
 #endif
 	if (!(bp->b_flags & B_FORMAT)) {
 		if ((fdu >= NFD) || (bp->b_blkno < 0)) {
-			printf("fdstrat: fdu = %d, blkno = %d, bcount = %d\n",
-			       fdu, bp->b_blkno, bp->b_bcount);
+			printf("fdstrat: fdu = %d, blkno = %lu, bcount = %ld\n",
+			       fdu, (u_long)bp->b_blkno, bp->b_bcount);
 			bp->b_error = EINVAL;
 			bp->b_flags |= B_ERROR;
 			goto bad;
@@ -1255,7 +1255,7 @@ retrier(fdcu)
 			printf(" (ST0 %b ", fdc->status[0], NE7_ST0BITS);
 			printf(" ST1 %b ", fdc->status[1], NE7_ST1BITS);
 			printf(" ST2 %b ", fdc->status[2], NE7_ST2BITS);
-			printf("cyl %d hd %d sec %d)\n",
+			printf("cyl %ld hd %ld sec %ld)\n",
 			       fdc->status[3], fdc->status[4], fdc->status[5]);
 		}
 		bp->b_flags |= B_ERROR;
diff --git a/sys/i386/isa/fdc.h b/sys/i386/isa/fdc.h
index c938eb4b194..950ef2346e9 100644
--- a/sys/i386/isa/fdc.h
+++ b/sys/i386/isa/fdc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fdc.h,v 1.2 1994/02/14 22:24:25 nate Exp $
+ *	$Id: fdc.h,v 1.3 1994/09/17 16:56:07 davidg Exp $
  *
  */
 
@@ -53,7 +53,7 @@ struct fdc_data
 	int	state;
 	int	retry;
 	int	fdout;		/* mirror of the w/o digital output reg */
-	int	status[7];	/* copy of the registers */
+	u_long	status[7];	/* copy of the registers */
 	struct buf head;	/* Head of buf chain      */
 };
 
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index edf975b4977..58bbd204608 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.18 1994/09/15 02:37:11 phk Exp $
+ *	$Id: lpt.c,v 1.19 1994/09/18 06:12:45 phk Exp $
  */
 
 /*
@@ -654,7 +654,7 @@ lptwrite(dev_t dev, struct uio * uio)
 	}
 
 	sc->sc_state &= ~INTERRUPTED;
-	while (n = min(BUFSIZE, uio->uio_resid)) {
+	while ((n = min(BUFSIZE, uio->uio_resid)) != 0) {
 		sc->sc_cp = sc->sc_inbuf->b_un.b_addr ;
 		uiomove(sc->sc_cp, n, uio);
 		sc->sc_xfercnt = n ;
@@ -841,7 +841,6 @@ lpinittables()
 static int
 lpioctl(struct ifnet *ifp, int cmd, caddr_t data)
 {
-    struct proc *p = curproc;
     struct lpt_softc *sc = lpt_sc + ifp->if_unit;
     struct ifaddr *ifa = (struct ifaddr *)data;
     struct ifreq *ifr = (struct ifreq *)data; 
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index bb4caca4844..d825634cef5 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.31 1994/09/17 18:08:36 joerg Exp $
+ *	$Id: fd.c,v 1.32 1994/09/25 06:04:21 phk Exp $
  *
  */
 
@@ -718,8 +718,8 @@ fdstrategy(struct buf *bp)
 #endif
 	if (!(bp->b_flags & B_FORMAT)) {
 		if ((fdu >= NFD) || (bp->b_blkno < 0)) {
-			printf("fdstrat: fdu = %d, blkno = %d, bcount = %d\n",
-			       fdu, bp->b_blkno, bp->b_bcount);
+			printf("fdstrat: fdu = %d, blkno = %lu, bcount = %ld\n",
+			       fdu, (u_long)bp->b_blkno, bp->b_bcount);
 			bp->b_error = EINVAL;
 			bp->b_flags |= B_ERROR;
 			goto bad;
@@ -1255,7 +1255,7 @@ retrier(fdcu)
 			printf(" (ST0 %b ", fdc->status[0], NE7_ST0BITS);
 			printf(" ST1 %b ", fdc->status[1], NE7_ST1BITS);
 			printf(" ST2 %b ", fdc->status[2], NE7_ST2BITS);
-			printf("cyl %d hd %d sec %d)\n",
+			printf("cyl %ld hd %ld sec %ld)\n",
 			       fdc->status[3], fdc->status[4], fdc->status[5]);
 		}
 		bp->b_flags |= B_ERROR;
diff --git a/sys/isa/fdc.h b/sys/isa/fdc.h
index c938eb4b194..950ef2346e9 100644
--- a/sys/isa/fdc.h
+++ b/sys/isa/fdc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fdc.h,v 1.2 1994/02/14 22:24:25 nate Exp $
+ *	$Id: fdc.h,v 1.3 1994/09/17 16:56:07 davidg Exp $
  *
  */
 
@@ -53,7 +53,7 @@ struct fdc_data
 	int	state;
 	int	retry;
 	int	fdout;		/* mirror of the w/o digital output reg */
-	int	status[7];	/* copy of the registers */
+	u_long	status[7];	/* copy of the registers */
 	struct buf head;	/* Head of buf chain      */
 };