From: Xiaotian Wu Date: Tue, 13 Jun 2023 09:06:31 +0000 (+0800) Subject: kern/{arm64,loongarch64}/dl_helper: Use the correct format specifier for formatted... X-Git-Tag: grub-2.12-rc1~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=985631c3d96bc7b8eff83fb0b1c106b522ad8e16;p=thirdparty%2Fgrub.git kern/{arm64,loongarch64}/dl_helper: Use the correct format specifier for formatted output Use PRIxGRUB_INT64_T format specifier for grub_int64_t type and drop redundant casts. Signed-off-by: Xiaotian Wu Reviewed-by: Daniel Kiper --- diff --git a/grub-core/kern/arm64/dl_helper.c b/grub-core/kern/arm64/dl_helper.c index cf7d432a3..10e3d1ec2 100644 --- a/grub-core/kern/arm64/dl_helper.c +++ b/grub-core/kern/arm64/dl_helper.c @@ -46,9 +46,9 @@ grub_arm64_set_xxxx26_offset (grub_uint32_t *place, grub_int64_t offset) { const grub_uint32_t insmask = grub_cpu_to_le32_compile_time (0xfc000000); - grub_dprintf ("dl", " reloc_xxxx64 %p %c= 0x%llx\n", + grub_dprintf ("dl", " reloc_xxxx64 %p %c= 0x%" PRIxGRUB_INT64_T "\n", place, offset > 0 ? '+' : '-', - offset < 0 ? (long long) -(unsigned long long) offset : offset); + offset < 0 ? -offset : offset); *place &= insmask; *place |= grub_cpu_to_le32 (offset >> 2) & ~insmask; diff --git a/grub-core/kern/loongarch64/dl_helper.c b/grub-core/kern/loongarch64/dl_helper.c index cda1a53c8..e869ce9ac 100644 --- a/grub-core/kern/loongarch64/dl_helper.c +++ b/grub-core/kern/loongarch64/dl_helper.c @@ -205,9 +205,9 @@ void grub_loongarch64_b26 (grub_uint32_t *place, grub_int64_t offset) grub_uint32_t val; const grub_uint32_t insmask = grub_cpu_to_le32_compile_time (0xfc000000); - grub_dprintf ("dl", " reloc_xxxx64 %p %c= 0x%llx\n", + grub_dprintf ("dl", " reloc_b26 %p %c= 0x%" PRIxGRUB_INT64_T "\n", place, offset > 0 ? '+' : '-', - offset < 0 ? (long long) -(unsigned long long) offset : offset); + offset < 0 ? -offset : offset); val = ((offset >> 18) & 0x3ff) | (((offset >> 2) & 0xffff) << 10);