From 4ed4139290aa85d7177e2e2831b5214497607443 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 2 Aug 2013 22:56:20 +0200 Subject: [PATCH] * grub-core/partmap/dfly.c: Simplify dprintfs for easier gettext analysis. --- ChangeLog | 5 +++++ grub-core/partmap/dfly.c | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 578ce6159..311ad0e31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-02 Vladimir Serbinenko + + * grub-core/partmap/dfly.c: Simplify dprintfs for easier gettext + analysis. + 2013-08-02 Vladimir Serbinenko * grub-core/loader/arm/linux.c: Change printf to dprintf. diff --git a/grub-core/partmap/dfly.c b/grub-core/partmap/dfly.c index e72b799e4..d30da8624 100644 --- a/grub-core/partmap/dfly.c +++ b/grub-core/partmap/dfly.c @@ -67,10 +67,9 @@ dfly_partition_map_iterate (grub_disk_t disk, if (label.magic != grub_cpu_to_le32_compile_time (GRUB_DISKLABEL64_MAGIC)) { grub_dprintf ("partition", - "bad magic (found 0x%" PRIxGRUB_UINT32_T "; " - "wanted 0x%" PRIxGRUB_UINT32_T ")\n", - grub_le_to_cpu32 (label.magic), - GRUB_DISKLABEL64_MAGIC); + "bad magic (found 0x%x; wanted 0x%x)\n", + (unsigned int) grub_le_to_cpu32 (label.magic), + (unsigned int) GRUB_DISKLABEL64_MAGIC); return grub_error (GRUB_ERR_BAD_PART_TABLE, "disklabel64 not found"); } @@ -88,11 +87,11 @@ dfly_partition_map_iterate (grub_disk_t disk, return grub_errno; grub_dprintf ("partition", - "partition %2d: offset 0x%" PRIxGRUB_UINT64_T ", " - "size 0x%" PRIxGRUB_UINT64_T "\n", + "partition %2d: offset 0x%llx, " + "size 0x%llx\n", partno, - grub_le_to_cpu64 (dpart.boffset), - grub_le_to_cpu64 (dpart.bsize)); + (unsigned long long) grub_le_to_cpu64 (dpart.boffset), + (unsigned long long) grub_le_to_cpu64 (dpart.bsize)); /* Is partition initialized? */ if (dpart.bsize == 0)