15a207
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
15a207
From: Peter Jones <pjones@redhat.com>
15a207
Date: Thu, 1 Jun 2017 10:07:50 -0400
15a207
Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it.
15a207
15a207
This avoids syntax checkers getting confused about if it's llx or lx.
15a207
15a207
Signed-off-by: Peter Jones <pjones@redhat.com>
15a207
---
15a207
 grub-core/loader/efi/chainloader.c | 3 ++-
15a207
 include/grub/efi/api.h             | 8 ++++++++
15a207
 2 files changed, 10 insertions(+), 1 deletion(-)
15a207
15a207
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
e15314
index 3a724a9fcbf..f4ddbeda687 100644
15a207
--- a/grub-core/loader/efi/chainloader.c
15a207
+++ b/grub-core/loader/efi/chainloader.c
e15314
@@ -789,7 +789,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
15a207
   efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
15a207
 			   grub_efi_system_table);
15a207
 
15a207
-  grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
15a207
+  grub_dprintf ("chain", "entry_point returned 0x%"PRIxGRUB_EFI_STATUS"\n",
15a207
+		efi_status);
15a207
   grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
15a207
   efi_status = grub_efi_free_pool (buffer);
15a207
 
15a207
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
e15314
index d97cdf98c80..955973ed484 100644
15a207
--- a/include/grub/efi/api.h
15a207
+++ b/include/grub/efi/api.h
15a207
@@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;
15a207
 typedef grub_uint16_t grub_efi_char16_t;
15a207
 
15a207
 typedef grub_efi_intn_t grub_efi_status_t;
15a207
+/* Make grub_efi_status_t reasonably printable. */
15a207
+#if GRUB_CPU_SIZEOF_VOID_P == 8
15a207
+#define PRIxGRUB_EFI_STATUS "lx"
15a207
+#define PRIdGRUB_EFI_STATUS "ld"
15a207
+#else
15a207
+#define PRIxGRUB_EFI_STATUS "llx"
15a207
+#define PRIdGRUB_EFI_STATUS "lld"
15a207
+#endif
15a207
 
15a207
 #define GRUB_EFI_ERROR_CODE(value)	\
15a207
   ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))