2008-04-06 Pavel Roskin <proski@gnu.org>
* util/biosdisk.c: Include grub/util/biosdisk.h. * util/grub-fstest.c (execute_command): Make static. * util/grub-mkdevicemap.c (check_device): Likewise. * util/i386/pc/misc.c: Include grub/machine/init.h. * util/powerpc/ieee1275/misc.c: Likewise. * util/lvm.c: Include grub/util/lvm.h. * util/misc.c: Include grub/kernel.h, grub/misc.h and grub/cache.h. * util/raid.c: Include grub/util/raid.h. (grub_util_getdiskname): Make static.
This commit is contained in:
parent
87a297bf55
commit
36747a6221
9 changed files with 22 additions and 3 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,5 +1,16 @@
|
|||
2008-04-06 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* util/biosdisk.c: Include grub/util/biosdisk.h.
|
||||
* util/grub-fstest.c (execute_command): Make static.
|
||||
* util/grub-mkdevicemap.c (check_device): Likewise.
|
||||
* util/i386/pc/misc.c: Include grub/machine/init.h.
|
||||
* util/powerpc/ieee1275/misc.c: Likewise.
|
||||
* util/lvm.c: Include grub/util/lvm.h.
|
||||
* util/misc.c: Include grub/kernel.h, grub/misc.h and
|
||||
grub/cache.h.
|
||||
* util/raid.c: Include grub/util/raid.h.
|
||||
(grub_util_getdiskname): Make static.
|
||||
|
||||
* util/grub-emu.c (main): Remove calls to grub_hostfs_init() and
|
||||
grub_hostfs_fini(), as they are called from grub_init_all() and
|
||||
grub_fini_all() respectively. This fixes an infinite loop in
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <grub/types.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/util/misc.h>
|
||||
#include <grub/util/biosdisk.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -93,7 +93,7 @@ grub_register_command (const char *name,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
static grub_err_t
|
||||
execute_command (grub_command_t cmd, int n, char **args)
|
||||
{
|
||||
int maxargs = 0;
|
||||
|
|
|
@ -277,7 +277,7 @@ get_i2o_disk_name (char *name, char unit)
|
|||
|
||||
/* Check if DEVICE can be read. If an error occurs, return zero,
|
||||
otherwise return non-zero. */
|
||||
int
|
||||
static int
|
||||
check_device (const char *device)
|
||||
{
|
||||
char buf[512];
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include <setjmp.h>
|
||||
|
||||
#include <grub/util/misc.h>
|
||||
#include <grub/machine/init.h>
|
||||
|
||||
void
|
||||
grub_reboot (void)
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#ifdef __linux__
|
||||
|
||||
#include <grub/util/misc.h>
|
||||
#include <grub/util/lvm.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -27,6 +27,9 @@
|
|||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <grub/kernel.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/cache.h>
|
||||
#include <grub/util/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/term.h>
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include <setjmp.h>
|
||||
|
||||
#include <grub/util/misc.h>
|
||||
#include <grub/machine/init.h>
|
||||
|
||||
void
|
||||
grub_reboot (void)
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
/* We only support RAID on Linux. */
|
||||
#ifdef __linux__
|
||||
#include <grub/util/misc.h>
|
||||
#include <grub/util/raid.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
|
@ -31,7 +32,7 @@
|
|||
#include <linux/raid/md_p.h>
|
||||
#include <linux/raid/md_u.h>
|
||||
|
||||
char *
|
||||
static char *
|
||||
grub_util_getdiskname (int major, int minor)
|
||||
{
|
||||
char *name = xmalloc (15);
|
||||
|
|
Loading…
Reference in a new issue