[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2382] 2009-07-01 Pavel Roskin <address@hidden>
From: |
Pavel Roskin |
Subject: |
[2382] 2009-07-01 Pavel Roskin <address@hidden> |
Date: |
Wed, 01 Jul 2009 15:59:06 +0000 |
Revision: 2382
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2382
Author: proski
Date: 2009-07-01 15:59:05 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
2009-07-01 Pavel Roskin <address@hidden>
* 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.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/include/grub/util/misc.h
trunk/grub2/util/grub-emu.c
trunk/grub2/util/misc.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-07-01 15:39:21 UTC (rev 2381)
+++ trunk/grub2/ChangeLog 2009-07-01 15:59:05 UTC (rev 2382)
@@ -1,5 +1,9 @@
2009-07-01 Pavel Roskin <address@hidden>
+ * 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.
Modified: trunk/grub2/include/grub/util/misc.h
===================================================================
--- trunk/grub2/include/grub/util/misc.h 2009-07-01 15:39:21 UTC (rev
2381)
+++ trunk/grub2/include/grub/util/misc.h 2009-07-01 15:59:05 UTC (rev
2382)
@@ -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, ...);
Modified: trunk/grub2/util/grub-emu.c
===================================================================
--- trunk/grub2/util/grub-emu.c 2009-07-01 15:39:21 UTC (rev 2381)
+++ trunk/grub2/util/grub-emu.c 2009-07-01 15:59:05 UTC (rev 2382)
@@ -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;
@@ -69,6 +69,22 @@
}
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)
{
}
Modified: trunk/grub2/util/misc.c
===================================================================
--- trunk/grub2/util/misc.c 2009-07-01 15:39:21 UTC (rev 2381)
+++ trunk/grub2/util/misc.c 2009-07-01 15:59:05 UTC (rev 2382)
@@ -439,19 +439,3 @@
}
#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 ();
-}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2382] 2009-07-01 Pavel Roskin <address@hidden>,
Pavel Roskin <=