From 36747a62215bbb1bce677c8a467c51aad1b08af6 Mon Sep 17 00:00:00 2001
From: proski <proski@localhost>
Date: Sun, 6 Apr 2008 17:51:56 +0000
Subject: [PATCH] 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.
---
 ChangeLog                    | 11 +++++++++++
 util/biosdisk.c              |  1 +
 util/grub-fstest.c           |  2 +-
 util/grub-mkdevicemap.c      |  2 +-
 util/i386/pc/misc.c          |  1 +
 util/lvm.c                   |  1 +
 util/misc.c                  |  3 +++
 util/powerpc/ieee1275/misc.c |  1 +
 util/raid.c                  |  3 ++-
 9 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34393de1f..02023f62d 100644
--- a/ChangeLog
+++ b/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
diff --git a/util/biosdisk.c b/util/biosdisk.c
index 4dd46d6b1..2d3d6017b 100644
--- a/util/biosdisk.c
+++ b/util/biosdisk.c
@@ -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>
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 241f23dd8..9e1d8863f 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -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;
diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index c071dab0d..5a33fdc78 100644
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -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];
diff --git a/util/i386/pc/misc.c b/util/i386/pc/misc.c
index 8490fbf70..d289deddd 100644
--- a/util/i386/pc/misc.c
+++ b/util/i386/pc/misc.c
@@ -19,6 +19,7 @@
 #include <setjmp.h>
 
 #include <grub/util/misc.h>
+#include <grub/machine/init.h>
 
 void
 grub_reboot (void)
diff --git a/util/lvm.c b/util/lvm.c
index 2b08b3966..7f85ccbb7 100644
--- a/util/lvm.c
+++ b/util/lvm.c
@@ -21,6 +21,7 @@
 #ifdef __linux__
 
 #include <grub/util/misc.h>
+#include <grub/util/lvm.h>
 
 #include <string.h>
 #include <sys/stat.h>
diff --git a/util/misc.c b/util/misc.c
index f3b94c6c1..b285af378 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -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>
diff --git a/util/powerpc/ieee1275/misc.c b/util/powerpc/ieee1275/misc.c
index b0ce83bd2..6f79612bb 100644
--- a/util/powerpc/ieee1275/misc.c
+++ b/util/powerpc/ieee1275/misc.c
@@ -19,6 +19,7 @@
 #include <setjmp.h>
 
 #include <grub/util/misc.h>
+#include <grub/machine/init.h>
 
 void
 grub_reboot (void)
diff --git a/util/raid.c b/util/raid.c
index e1ccff4ef..82ae413cf 100644
--- a/util/raid.c
+++ b/util/raid.c
@@ -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);