From 56c98584c7cb4b796a74654706a7b90519f3eaa0 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 10 Feb 2012 12:52:46 +0100 Subject: [PATCH] * util/misc.c (grub_util_write_image_at): Fix format specification. (grub_util_write_image): Likewise. (grub_script_execute_argument_to_string): Removed (unused). (grub_script_execute_menuentry): Likewise. (grub_putchar): Likewise. --- ChangeLog | 8 ++++++++ util/misc.c | 23 +++-------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ece607fe..4606a769e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-02-10 Vladimir Serbinenko + + * util/misc.c (grub_util_write_image_at): Fix format specification. + (grub_util_write_image): Likewise. + (grub_script_execute_argument_to_string): Removed (unused). + (grub_script_execute_menuentry): Likewise. + (grub_putchar): Likewise. + 2012-02-10 Vladimir Serbinenko * include/grub/symbol.h (EXT_C) [GRUB_UTIL]: Removed. diff --git a/util/misc.c b/util/misc.c index 0c45d9012..93fa0b4bd 100644 --- a/util/misc.c +++ b/util/misc.c @@ -148,7 +148,8 @@ void grub_util_write_image_at (const void *img, size_t size, off_t offset, FILE *out, const char *name) { - grub_util_info ("writing 0x%x bytes at offset 0x%x", size, offset); + grub_util_info ("writing 0x%" PRIxGRUB_SIZE " bytes at offset 0x%llx", + size, (unsigned long long) offset); if (fseeko (out, offset, SEEK_SET) == -1) grub_util_error (_("cannot seek `%s': %s"), name, strerror (errno)); @@ -161,7 +162,7 @@ void grub_util_write_image (const char *img, size_t size, FILE *out, const char *name) { - grub_util_info ("writing 0x%x bytes", size); + grub_util_info ("writing 0x%" PRIxGRUB_SIZE " bytes", size); if (fwrite (img, 1, size, out) != size) { if (!name) @@ -173,12 +174,6 @@ grub_util_write_image (const char *img, size_t size, FILE *out, } } -char * -grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused))) -{ - return 0; -} - grub_err_t grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused))) { @@ -209,12 +204,6 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused return 0; } -grub_err_t -grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused))) -{ - return 0; -} - grub_err_t grub_script_execute (struct grub_script *script) { @@ -224,12 +213,6 @@ grub_script_execute (struct grub_script *script) return script->cmd->exec (script->cmd); } -void -grub_putchar (int c) -{ - putchar (c); -} - int grub_getkey (void) {