From e482ffb0dcaa5a0b5d69aeaa178ece164cf9ba8c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 13 Jan 2013 01:47:46 +0000 Subject: [PATCH 102/364] * util/grub-mkimage.c (generate_image): Fix "size of public key" info message. --- ChangeLog | 5 +++++ util/grub-mkimage.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14bff81..784d737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2013-01-13 Colin Watson + * util/grub-mkimage.c (generate_image): Fix "size of public key" + info message. + +2013-01-13 Colin Watson + Remove nested functions from PCI iterators. * grub-core/bus/pci.c (grub_pci_iterate): Add hook_data argument, diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c index 23a9970..d0eecf2 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -740,8 +740,8 @@ generate_image (const char *dir, const char *prefix, { size_t curs; curs = ALIGN_ADDR (grub_util_get_image_size (pubkey_paths[i])); - grub_util_info ("the size of public key is 0x%llx", - (unsigned long long) pubkey_paths[i]); + grub_util_info ("the size of public key %zd is 0x%llx", + i, (unsigned long long) curs); total_module_size += curs + sizeof (struct grub_module_header); } } -- 1.8.1.4