From 4ad2d0499cf73d04ee56d1ff158e2446e0ad571d Mon Sep 17 00:00:00 2001 From: proski Date: Fri, 18 Jul 2008 01:11:33 +0000 Subject: [PATCH] 2008-07-17 Pavel Roskin * disk/efi/efidisk.c: Fix format warnings on x86_64. * kern/efi/efi.c: Likewise. --- ChangeLog | 3 +++ disk/efi/efidisk.c | 10 +++++----- kern/efi/efi.c | 25 +++++++++++++------------ 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1437af557..3943e71e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-07-17 Pavel Roskin + * disk/efi/efidisk.c: Fix format warnings on x86_64. + * kern/efi/efi.c: Likewise. + * aclocal.m4 (grub_PROG_TARGET_CC): New macro. Check if the target compiler is functional. * configure.ac: Call grub_PROG_TARGET_CC once all target flags diff --git a/disk/efi/efidisk.c b/disk/efi/efidisk.c index c66221081..d2f5ea202 100644 --- a/disk/efi/efidisk.c +++ b/disk/efi/efidisk.c @@ -539,7 +539,7 @@ grub_efidisk_open (const char *name, struct grub_disk *disk) /* FIXME: Probably it is better to store the block size in the disk, and total sectors should be replaced with total blocks. */ grub_dprintf ("efidisk", "m = %p, last block = %llx, block size = %x\n", - m, m->last_block, m->block_size); + m, (unsigned long long) m->last_block, m->block_size); disk->total_sectors = (m->last_block * (m->block_size >> GRUB_DISK_SECTOR_BITS)); disk->data = d; @@ -571,8 +571,8 @@ grub_efidisk_read (struct grub_disk *disk, grub_disk_addr_t sector, bio = d->block_io; grub_dprintf ("efidisk", - "reading 0x%x sectors at the sector 0x%llx from %s\n", - size, sector, disk->name); + "reading 0x%lx sectors at the sector 0x%llx from %s\n", + (unsigned long) size, (unsigned long long) sector, disk->name); status = efi_call_5 (dio->read, dio, bio->media->media_id, (grub_efi_uint64_t) sector << GRUB_DISK_SECTOR_BITS, @@ -599,8 +599,8 @@ grub_efidisk_write (struct grub_disk *disk, grub_disk_addr_t sector, bio = d->block_io; grub_dprintf ("efidisk", - "writing 0x%x sectors at the sector 0x%llx to %s\n", - size, sector, disk->name); + "writing 0x%lx sectors at the sector 0x%llx to %s\n", + (unsigned long) size, (unsigned long long) sector, disk->name); status = efi_call_5 (dio->write, dio, bio->media->media_id, (grub_efi_uint64_t) sector << GRUB_DISK_SECTOR_BITS, diff --git a/kern/efi/efi.c b/kern/efi/efi.c index 25dc1a609..9c9a40003 100644 --- a/kern/efi/efi.c +++ b/kern/efi/efi.c @@ -367,8 +367,8 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) grub_memcpy (&mmapped, dp, len); grub_printf ("/MMap(%x,%llx,%llx)", (unsigned) mmapped.memory_type, - mmapped.start_address, - mmapped.end_address); + (unsigned long long) mmapped.start_address, + (unsigned long long) mmapped.end_address); } break; case GRUB_EFI_VENDOR_DEVICE_PATH_SUBTYPE: @@ -470,14 +470,15 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) grub_efi_fibre_channel_device_path_t fc; grub_memcpy (&fc, dp, len); grub_printf ("/FibreChannel(%llx,%llx)", - fc.wwn, fc.lun); + (unsigned long long) fc.wwn, + (unsigned long long) fc.lun); } break; case GRUB_EFI_1394_DEVICE_PATH_SUBTYPE: { grub_efi_1394_device_path_t firewire; grub_memcpy (&firewire, dp, len); - grub_printf ("/1394(%llx)", firewire.guid); + grub_printf ("/1394(%llx)", (unsigned long long) firewire.guid); } break; case GRUB_EFI_USB_DEVICE_PATH_SUBTYPE: @@ -574,9 +575,9 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) grub_memcpy (&ib, dp, len); grub_printf ("/InfiniBand(%x,%llx,%llx,%llx)", (unsigned) ib.port_gid[0], /* XXX */ - ib.remote_id, - ib.target_port_id, - ib.device_id); + (unsigned long long) ib.remote_id, + (unsigned long long) ib.target_port_id, + (unsigned long long) ib.device_id); } break; case GRUB_EFI_UART_DEVICE_PATH_SUBTYPE: @@ -584,7 +585,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) grub_efi_uart_device_path_t uart; grub_memcpy (&uart, dp, len); grub_printf ("/UART(%llu,%u,%x,%x)", - uart.baud_rate, + (unsigned long long) uart.baud_rate, uart.data_bits, uart.parity, uart.stop_bits); @@ -623,8 +624,8 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) grub_memcpy (&hd, dp, len); grub_printf ("/HD(%u,%llx,%llx,%02x%02x%02x%02x%02x%02x%02x%02x,%x,%x)", hd.partition_number, - hd.partition_start, - hd.partition_size, + (unsigned long long) hd.partition_start, + (unsigned long long) hd.partition_size, (unsigned) hd.partition_signature[0], (unsigned) hd.partition_signature[1], (unsigned) hd.partition_signature[2], @@ -643,8 +644,8 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) grub_memcpy (&cd, dp, len); grub_printf ("/CD(%u,%llx,%llx)", cd.boot_entry, - cd.partition_start, - cd.partition_size); + (unsigned long long) cd.partition_start, + (unsigned long long) cd.partition_size); } break; case GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE: