2008-03-30 Pavel Roskin <proski@gnu.org>
* fs/udf.c (grub_udf_mount): Fix warning about a shadowing a variable. * include/grub/i386/loader.h: Change declaration of grub_linux_boot() to match what grub_loader_set() expects. * util/getroot.c (grub_guess_root_device): Return const char* to fix a warning. * util/grub-probe.c (probe): Fix a warning about uninitialized abstraction_name variable. * util/i386/get_disk_name.c (grub_util_get_disk_name): Mark second argument as unused to fix a warning.
This commit is contained in:
parent
9a3f3296d5
commit
8790bb0466
7 changed files with 21 additions and 9 deletions
|
@ -20,6 +20,7 @@
|
|||
#define GRUB_LOADER_CPU_HEADER 1
|
||||
|
||||
#include <grub/types.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/symbol.h>
|
||||
#include <grub/multiboot.h>
|
||||
|
||||
|
@ -30,7 +31,7 @@ extern grub_int32_t EXPORT_VAR(grub_linux_is_bzimage);
|
|||
extern grub_addr_t EXPORT_VAR(grub_os_area_addr);
|
||||
extern grub_size_t EXPORT_VAR(grub_os_area_size);
|
||||
|
||||
void EXPORT_FUNC(grub_linux_boot) (void) __attribute__ ((noreturn));
|
||||
grub_err_t EXPORT_FUNC(grub_linux_boot) (void);
|
||||
|
||||
/* The asm part of the multiboot loader. */
|
||||
void EXPORT_FUNC(grub_multiboot_real_boot) (grub_addr_t entry,
|
||||
|
|
|
@ -29,6 +29,6 @@ char *grub_guess_root_device (const char *dir);
|
|||
char *grub_get_prefix (const char *dir);
|
||||
int grub_util_get_dev_abstraction (const char *os_dev);
|
||||
char *grub_util_get_grub_dev (const char *os_dev);
|
||||
char *grub_util_check_block_device (const char *blk_dev);
|
||||
const char *grub_util_check_block_device (const char *blk_dev);
|
||||
|
||||
#endif /* ! GRUB_UTIL_GETROOT_HEADER */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue