Imported Upstream version 3.10

[debian/elilo] / fs / ext2fs.c

diff --git a/fs/ext2fs.c b/fs/ext2fs.c
index bec47fe8e8652940a67e4a22c40b90db7acf1f19..a0a9d876f563c65cb60ff4d015d03820ea714a90 100644 (file)
--- a/fs/ext2fs.c
+++ b/fs/ext2fs.c
@@ -142,7 +142,7 @@ read_bytes(EFI_BLOCK_IO *blkio, UINT32 mediaid, UINTN offset, VOID *addr, UINTN
                return ret;
        }
 
-       DBG_PRT((L"readblock(%x, %d, %d, %d, %x)", blkio, mediaid, base, buffer_size, buffer));
+       DBG_PRT((L"readblock(PTR_FMT ", %d, %ld, %d, " PTR_FMT ")", blkio, mediaid, base, buffer_size, buffer));
 
        status = uefi_call_wrapper(blkio->ReadBlocks, 5, blkio, mediaid, base, buffer_size, buffer); 
        if (EFI_ERROR(status)) {
@@ -903,7 +903,7 @@ ext2fs_install_one(EFI_HANDLE dev, VOID **intf)
        }
        
        if (sb.s_magic != EXT2_SUPER_MAGIC) {
-               DBG_PRT((L"bad magic 0x%x\n", sb.s_magic));
+               DBG_PRT((L"bad magic "PTR_FMT"\n", sb.s_magic));
                return EFI_INVALID_PARAMETER;
        }