From fe6864c5f3ba9085acdac569b7567b911e01f445 Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Tue, 8 Dec 2020 14:46:59 +0100
Subject: [PATCH] fixed 354852 Invalid type in argument to printf format
 specifier

---
 src/tools/gids-tool.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/tools/gids-tool.c b/src/tools/gids-tool.c
index b9b0a4a0..1c9602b0 100644
--- a/src/tools/gids-tool.c
+++ b/src/tools/gids-tool.c
@@ -415,8 +415,14 @@ static int print_info(sc_card_t *card) {
 					keymaprecordnum = (keymapsize - 1) / sizeof(struct gids_keymap_record);
 				}
 				for (i = 0; i < cmaprecordnum; i++) {
-					printf("   container:                  %d\n", i);
-					wprintf(L"      guid:                    %s\n", cmaprecords[i].wszGuid);
+#ifdef _WIN32
+					wprintf(L"      guid:                    %ls\n", cmaprecords[i].wszGuid);
+#else
+					/* avoid converting Windows' WCHAR to Unix' wchar_t by simply dumping the content */
+					util_hex_dump(stdout,
+							(unsigned char *) cmaprecords[i].wszGuid,
+							sizeof cmaprecords[i].wszGuid, "");
+#endif
 					printf("      bFlags:                  ");
 					if (cmaprecords[i].bFlags & CONTAINER_MAP_VALID_CONTAINER) {
 						printf("Valid container");