* grub-core/term/efi/console.c (efi_codes): Fix GRUB_TERM_KEY_*

	constants usage.
	* grub-core/kern/emu/console.c (grub_ncurses_getkey):
	Fix GRUB_TERM_KEY_* constants usage.
	* grub-core/kern/emu/misc.c (asprintf): Fix vasprintf usage.

diff --git a/ChangeLog b/ChangeLog
index 3811381eed571e082ee790a1c482eb621b270b2f..8af302bf32841746470b6d55b1a7c366e9ce1a60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/term/efi/console.c (efi_codes): Fix GRUB_TERM_KEY_*
+       constants usage.
+       * grub-core/kern/emu/console.c (grub_ncurses_getkey):
+       Fix GRUB_TERM_KEY_* constants usage.
+       * grub-core/kern/emu/misc.c (asprintf): Fix vasprintf usage.
+
 2010-09-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/bus/usb/ohci.c (grub_ohci_cancel_transfer): Use %p to

diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index c710777ea9406f6b6d85c40ca8a95400be39021d..c75a2f8f6fca9a835795a715f6bed3ed48e3fd9e 100644 (file)
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -174,7 +174,7 @@ asprintf (char **buf, const char *fmt, ...)
   va_list ap;
 
   va_start (ap, fmt);
-  status = vasprintf (*buf, fmt, ap);
+  status = vasprintf (buf, fmt, ap);
   va_end (ap);
 
   return status;

diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
index c92f6a75ee9c5154e473d2953987b43f7970ec04..4872a9a3f70b60d8bf78fc22d48b6d7346ab57d9 100644 (file)
--- a/grub-core/term/efi/console.c
+++ b/grub-core/term/efi/console.c
@@ -103,9 +103,9 @@ grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)),
 
 const unsigned efi_codes[] =
   {
-    0, GRUB_TERM_UP, GRUB_TERM_DOWN, GRUB_TERM_RIGHT,
-    GRUB_TERM_LEFT, GRUB_TERM_HOME, GRUB_TERM_END, GRUB_TERM_KEY_INSERT,
-    GRUB_TERM_DC, GRUB_TERM_KEY_PPAGE, GRUB_TERM_KEY_NPAGE, GRUB_TERM_KEY_F1,
+    0, GRUB_TERM_KEY_UP, GRUB_TERM_KEY_DOWN, GRUB_TERM_KEY_RIGHT,
+    GRUB_TERM_KEY_LEFT, GRUB_TERM_KEY_HOME, GRUB_TERM_KEY_END, GRUB_TERM_KEY_INSERT,
+    GRUB_TERM_KEY_DC, GRUB_TERM_KEY_PPAGE, GRUB_TERM_KEY_NPAGE, GRUB_TERM_KEY_F1,
     GRUB_TERM_KEY_F2, GRUB_TERM_KEY_F3, GRUB_TERM_KEY_F4, GRUB_TERM_KEY_F5,
     GRUB_TERM_KEY_F6, GRUB_TERM_KEY_F7, GRUB_TERM_KEY_F8, GRUB_TERM_KEY_F9,
     GRUB_TERM_KEY_F10, 0, 0, '\e'