svn commit: r304221 - head/sys/boot/efi/boot1

Emmanuel Vadot manu at FreeBSD.org
Tue Aug 16 14:23:37 UTC 2016


Author: manu
Date: Tue Aug 16 14:23:35 2016
New Revision: 304221
URL: https://svnweb.freebsd.org/changeset/base/304221

Log:
  Use %ju modifier for u_int64_t and %jd modifier for off_t.
  off_t is long long on arm32 and long on amd64
  
  MFC after:	1 week

Modified:
  head/sys/boot/efi/boot1/ufs_module.c
  head/sys/boot/efi/boot1/zfs_module.c

Modified: head/sys/boot/efi/boot1/ufs_module.c
==============================================================================
--- head/sys/boot/efi/boot1/ufs_module.c	Tue Aug 16 14:15:09 2016	(r304220)
+++ head/sys/boot/efi/boot1/ufs_module.c	Tue Aug 16 14:23:35 2016	(r304221)
@@ -56,7 +56,7 @@ dskread(void *buf, u_int64_t lba, int nb
 	    devinfo->dev->Media->MediaId, lba, size, buf);
 
 	if (status != EFI_SUCCESS) {
-		DPRINTF("dskread: failed dev: %p, id: %u, lba: %lu, size: %d, "
+		DPRINTF("dskread: failed dev: %p, id: %u, lba: %zu, size: %d, "
 		    "status: %lu\n", devinfo->dev,
 		    devinfo->dev->Media->MediaId, lba, size,
 		    EFI_ERROR_CODE(status));

Modified: head/sys/boot/efi/boot1/zfs_module.c
==============================================================================
--- head/sys/boot/efi/boot1/zfs_module.c	Tue Aug 16 14:15:09 2016	(r304220)
+++ head/sys/boot/efi/boot1/zfs_module.c	Tue Aug 16 14:23:35 2016	(r304221)
@@ -53,7 +53,7 @@ vdev_read(vdev_t *vdev, void *priv, off_
 	status = devinfo->dev->ReadBlocks(devinfo->dev,
 	    devinfo->dev->Media->MediaId, lba, bytes, buf);
 	if (status != EFI_SUCCESS) {
-		DPRINTF("vdev_read: failed dev: %p, id: %u, lba: %zu, size: %zu,"
+		DPRINTF("vdev_read: failed dev: %p, id: %u, lba: %jd, size: %zu,"
                     " status: %lu\n", devinfo->dev,
                     devinfo->dev->Media->MediaId, lba, bytes,
                     EFI_ERROR_CODE(status));


More information about the svn-src-all mailing list