2009-07-01 Pavel Roskin <proski@gnu.org>

	* util/misc.c: Move grub_reboot() and grub_halt() ...
	* util/grub-emu.c: ... here.  Make main_env static.
	* include/grub/util/misc.h: Remove main_env.

diff --git a/ChangeLog b/ChangeLog
index 38d3a8a98b50fc00712f7c4c913cc1ba1b6897fb..d1772af1dee222196249eca14ccf2a7e530fbb7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-07-01  Pavel Roskin  <proski@gnu.org>
 
+       * util/misc.c: Move grub_reboot() and grub_halt() ...
+       * util/grub-emu.c: ... here.  Make main_env static.
+       * include/grub/util/misc.h: Remove main_env.
+
        * kern/mm.c: Use correct format to print size_t.
 
        * include/grub/elf.h: Define Elf_Sword and Elf_Xword.

diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index af7cb2dbd297d84a869a32ab012547f9c6d9bd93..6a93ab0442bc41971f3ad47af911beb24c7a9a89 100644 (file)
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -38,7 +38,6 @@
 
 extern char *progname;
 extern int verbosity;
-extern jmp_buf main_env;
 
 void grub_util_warn (const char *fmt, ...);
 void grub_util_info (const char *fmt, ...);

diff --git a/util/grub-emu.c b/util/grub-emu.c
index c133dbead13f3cb70ebac58e6287e61a32f2e733..31365f3e0ba9007b6538a27b963ca5e422053a75 100644 (file)
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -40,7 +40,7 @@
 #include <grub_emu_init.h>
 
 /* Used for going back to the main function.  */
-jmp_buf main_env;
+static jmp_buf main_env;
 
 /* Store the prefix specified by an argument.  */
 static char *prefix = 0;
@@ -68,6 +68,22 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
   return GRUB_ERR_BAD_MODULE;
 }
 
+void
+grub_reboot (void)
+{
+  longjmp (main_env, 1);
+}
+
+void
+grub_halt (
+#ifdef GRUB_MACHINE_PCBIOS
+          int no_apm __attribute__ ((unused))
+#endif
+          )
+{
+  grub_reboot ();
+}
+
 void
 grub_machine_init (void)
 {

diff --git a/util/misc.c b/util/misc.c
index 2d0039028340aa7419a1bbf5874ed5d6ed4b6c2f..f615a42c7a4381d7ef4bc338fd25093a92d7314a 100644 (file)
--- a/util/misc.c
+++ b/util/misc.c
@@ -439,19 +439,3 @@ fail:
 }
 
 #endif /* __MINGW32__ */
-
-void
-grub_reboot (void)
-{
-  longjmp (main_env, 1);
-}
-
-void
-grub_halt (
-#ifdef GRUB_MACHINE_PCBIOS
-          int no_apm __attribute__ ((unused))
-#endif
-          )
-{
-  grub_reboot ();
-}