Author: manu
Date: Wed Aug 17 08:29:30 2016
New Revision: 304271
URL: https://svnweb.freebsd.org/changeset/base/304271

Log:
  Correctly print and cast u_int64_t and off_t.
  
  Reported by:  ed, imp
  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        Wed Aug 17 08:26:08 2016        
(r304270)
+++ head/sys/boot/efi/boot1/ufs_module.c        Wed Aug 17 08:29:30 2016        
(r304271)
@@ -56,9 +56,9 @@ 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: %zu, size: %d, "
+               DPRINTF("dskread: failed dev: %p, id: %u, lba: %ju, size: %d, "
                    "status: %lu\n", devinfo->dev,
-                   devinfo->dev->Media->MediaId, lba, size,
+                   devinfo->dev->Media->MediaId, (uintmax_t)lba, size,
                    EFI_ERROR_CODE(status));
                return (-1);
        }

Modified: head/sys/boot/efi/boot1/zfs_module.c
==============================================================================
--- head/sys/boot/efi/boot1/zfs_module.c        Wed Aug 17 08:26:08 2016        
(r304270)
+++ head/sys/boot/efi/boot1/zfs_module.c        Wed Aug 17 08:29:30 2016        
(r304271)
@@ -54,9 +54,9 @@ vdev_read(vdev_t *vdev, void *priv, off_
            devinfo->dev->Media->MediaId, lba, bytes, buf);
        if (status != EFI_SUCCESS) {
                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));
+                   " status: %lu\n", devinfo->dev,
+                   devinfo->dev->Media->MediaId, (intmax_t)lba, bytes,
+                   EFI_ERROR_CODE(status));
                return (-1);
        }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to