* util/grub-mklayout.c (console_grub_equivalences_shift): Terminate

with NULL.
(console_grub_equivalences_unshift): Likewise.
Reported by: Daniel Dehennin.

diff --git a/ChangeLog b/ChangeLog
index a4f7122fb5791cb8be8b4b4524f6d013107f00f8..56a8db213685a0a394e85cbb72a97f2f2fd1074b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-11  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-mklayout.c (console_grub_equivalences_shift): Terminate
+       with NULL.
+       (console_grub_equivalences_unshift): Likewise.
+       Reported by: Daniel Dehennin.
+
 2011-01-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/i386/pc/pxe.c (set_mac_env): Export variable.

diff --git a/util/grub-mklayout.c b/util/grub-mklayout.c
index 36f6e04fcc826815d8e9b99a1bd7948e69efc347..04501cb4096b6260a62c833275edd44871602d2c 100644 (file)
--- a/util/grub-mklayout.c
+++ b/util/grub-mklayout.c
@@ -60,6 +60,8 @@ static struct console_grub_equivalence console_grub_equivalences_shift[] = {
   {"KP_8", '8'},
   {"KP_9", '9'},
   {"KP_Period", '.'},
+
+  {NULL, '\0'}
 };
 
 static struct console_grub_equivalence console_grub_equivalences_unshift[] = {
@@ -74,6 +76,8 @@ static struct console_grub_equivalence console_grub_equivalences_unshift[] = {
   {"KP_8", GRUB_TERM_KEY_UP},
   {"KP_9", GRUB_TERM_KEY_PPAGE},
   {"KP_Period", GRUB_TERM_KEY_DC},
+
+  {NULL, '\0'}
 };
 
 static struct console_grub_equivalence console_grub_equivalences_common[] = {