vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/misc.c (grub_util_write_image_at): Fix format specification.

Browse source 
(grub_util_write_image): Likewise.
	(grub_script_execute_argument_to_string): Removed (unused).
	(grub_script_execute_menuentry): Likewise.
	(grub_putchar): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:52:46 +01:00
parent 164ebb480d
commit 56c98584c7
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* 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 <phcoder@gmail.com> 2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/symbol.h (EXT_C) [GRUB_UTIL]: Removed. * include/grub/symbol.h (EXT_C) [GRUB_UTIL]: Removed.

23
util/misc.c
View file

@ -148,7 +148,8 @@ void
grub_util_write_image_at (const void *img, size_t size, off_t offset, FILE *out, grub_util_write_image_at (const void *img, size_t size, off_t offset, FILE *out,
const char *name) 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) if (fseeko (out, offset, SEEK_SET) == -1)
grub_util_error (_("cannot seek `%s': %s"), grub_util_error (_("cannot seek `%s': %s"),
name, strerror (errno)); name, strerror (errno));
@ -161,7 +162,7 @@ void
grub_util_write_image (const char *img, size_t size, FILE *out, grub_util_write_image (const char *img, size_t size, FILE *out,
const char *name) 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 (fwrite (img, 1, size, out) != size)
{ {
if (!name) 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_err_t
grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused))) 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; return 0;
} }
grub_err_t
grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
{
return 0;
}
grub_err_t grub_err_t
grub_script_execute (struct grub_script *script) grub_script_execute (struct grub_script *script)
{ {
@ -224,12 +213,6 @@ grub_script_execute (struct grub_script *script)
return script->cmd->exec (script->cmd); return script->cmd->exec (script->cmd);
} }
void
grub_putchar (int c)
{
putchar (c);
}
int int
grub_getkey (void) grub_getkey (void)
{ {