Use full initializer for initrd_ctx to avoid fatal warnings with older GCC

struct ... foo = { 0, } is valid initializer, but older GCC emits
warning which is fatal error due to -Werror=missing-field-initializer.
So simply use full initializer to avoid these errors. This was fixed
probably in GCC 4.7.

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36750

diff --git a/ChangeLog b/ChangeLog
index 192e8bca46c517d463ac08dd2569ca996fc1bf56..190d19d9b25e9c20c183b433ed2205b062ca35b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-10-14  Andrei Borzenkov  <arvidjaar@gmail.com>
+
+       * grub-core/loader/arm/linux.c: Use full initializer for initrd_ctx to
+       avoid fatal warnings with older gcc (probably before 4.7).
+       * grub-core/loader/arm64/linux.c: Likewise.
+       * grub-core/loader/i386/linux.c: Likewise.
+       * grub-core/loader/i386/pc/linux.c: Likewise.
+       * grub-core/loader/ia64/efi/linux.c: Likewise.
+       * grub-core/loader/mips/linux.c: Likewise.
+       * grub-core/loader/powerpc/ieee1275/linux.c: Likewise.
+       * grub-core/loader/sparc64/ieee1275/linux.c: Likewise.
+
 2014-09-25  Colin Watson  <cjwatson@ubuntu.com>
 
        Fix in-tree --platform=none

diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
index 62cbe75d34ecd35b8eb56240ef1b19fb5ab5bd87..5b39f02bb2e592d85639891db6eb68a97ce12dfa 100644 (file)
--- a/grub-core/loader/arm/linux.c
+++ b/grub-core/loader/arm/linux.c
@@ -396,7 +396,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file;
   grub_size_t size = 0;
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index 0dc144e5da0efce6d5fac3ddcb0ad5edfdce00da..564a75a804083f95a7847090b537071be0d2cf23 100644 (file)
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -328,7 +328,7 @@ static grub_err_t
 grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
                 int argc, char *argv[])
 {
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
   int initrd_size, initrd_pages;
   void *initrd_mem = NULL;
 

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 0bd060a5253f6e1cfab06840c967e4b2cb2bd6f6..291f7289f3e6835a08149698c4114e49f8285f7a 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -1050,7 +1050,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_addr_t addr_min, addr_max;
   grub_addr_t addr;
   grub_err_t err;
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
 
   if (argc == 0)
     {

diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index e88341e3cdee74f0e8092f99e91033280ecf0902..870992b7d8ad3889513067d87b35ab3ecec45823 100644 (file)
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -388,7 +388,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_uint8_t *initrd_chunk;
   grub_addr_t initrd_addr;
   grub_err_t err;
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
 
   if (argc == 0)
     {

diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
index eb78e6e626b9622a03a55a4614660e3f17000562..efaa42ccdd2bf74321de20cf5033a80676cc7dc3 100644 (file)
--- a/grub-core/loader/ia64/efi/linux.c
+++ b/grub-core/loader/ia64/efi/linux.c
@@ -568,7 +568,7 @@ static grub_err_t
 grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
                 int argc, char *argv[])
 {
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
 
   if (argc == 0)
     {

diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
index 4a3e8c5dfa2bcc9a72da4f49c0f7cf3634734c2f..5f383be3d076985199474410f7a09fbb5c3e581b 100644 (file)
--- a/grub-core/loader/mips/linux.c
+++ b/grub-core/loader/mips/linux.c
@@ -415,7 +415,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   void *initrd_src;
   grub_addr_t initrd_dest;
   grub_err_t err;
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
index 787d7dc2af3b8266f81ab5ece9a80968f43b4635..6e814649f319c197c61b67013da9e85d652f8f7b 100644 (file)
--- a/grub-core/loader/powerpc/ieee1275/linux.c
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
@@ -333,7 +333,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_size_t size = 0;
   grub_addr_t first_addr;
   grub_addr_t addr;
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
 
   if (argc == 0)
     {

diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
index c5e8dfab23481b0e2a7e6cdba2bf83cbe6c14219..6389170e6c577049d448626b66dde28104ef3429 100644 (file)
--- a/grub-core/loader/sparc64/ieee1275/linux.c
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
@@ -373,7 +373,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_addr_t paddr;
   grub_addr_t addr;
   int ret;
-  struct grub_linux_initrd_context initrd_ctx = { 0, };
+  struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
 
   if (argc == 0)
     {