Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Mar 2002 09:07:22 -0800 (PST)
From:      "Bruce A. Mah" <bmah@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 8068 for review
Message-ID:  <200203201707.g2KH7M310009@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8068

Change 8068 by bmah@bmah_tomcat on 2002/03/20 09:06:45

	MFCVS:  Unbreak non-NO_WERROR buildkernel by quieting warnings
	caused by printf format mismatches.
	
	amr/amr.c	1.29->1.31
	mlx/mlx.c	1.31->1.33

Affected files ...

... //depot/releng/5_dp1/src/sys/dev/amr/amr.c#2 edit
... //depot/releng/5_dp1/src/sys/dev/mlx/mlx.c#2 edit

Differences ...

==== //depot/releng/5_dp1/src/sys/dev/amr/amr.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/amr/amr.c,v 1.29 2002/01/08 06:47:02 msmith Exp $
+ *	$FreeBSD: src/sys/dev/amr/amr.c,v 1.31 2002/03/18 23:24:00 bde Exp $
  */
 
 /*
@@ -813,8 +813,9 @@
     /* we fill in the s/g related data when the command is mapped */
 
     if ((bio->bio_pblkno + blkcount) > sc->amr_drive[driveno].al_size)
-	device_printf(sc->amr_dev, "I/O beyond end of unit (%u,%d > %u)\n", 
-		      bio->bio_pblkno, blkcount, sc->amr_drive[driveno].al_size);
+	device_printf(sc->amr_dev, "I/O beyond end of unit (%lld,%d > %lu)\n", 
+		      (long long)bio->bio_pblkno, blkcount,
+		      (u_long)sc->amr_drive[driveno].al_size);
 
 out:
     if (error != 0) {

==== //depot/releng/5_dp1/src/sys/dev/mlx/mlx.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/mlx/mlx.c,v 1.31 2001/12/10 08:09:42 obrien Exp $
+ *	$FreeBSD: src/sys/dev/mlx/mlx.c,v 1.33 2002/03/18 23:38:16 bde Exp $
  */
 
 /*
@@ -1777,8 +1777,10 @@
 	blkcount = (MLX_BIO_LENGTH(bp) + MLX_BLKSIZE - 1) / MLX_BLKSIZE;
 
 	if ((MLX_BIO_LBA(bp) + blkcount) > sc->mlx_sysdrive[driveno].ms_size)
-	    device_printf(sc->mlx_dev, "I/O beyond end of unit (%u,%d > %u)\n", 
-			  MLX_BIO_LBA(bp), blkcount, sc->mlx_sysdrive[driveno].ms_size);
+	    device_printf(sc->mlx_dev,
+			  "I/O beyond end of unit (%lld,%d > %lu)\n", 
+			  (long long)MLX_BIO_LBA(bp), blkcount,
+			  (u_long)sc->mlx_sysdrive[driveno].ms_size);
 
 	/*
 	 * Build the I/O command.  Note that the SG list type bits are set to zero,

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-releng" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203201707.g2KH7M310009>