vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
Andrei Borzenkov 2014-10-14 20:12:15 +04:00
parent 77063f4cb6
commit 9a67e1ac8e
9 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -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> 2014-09-25 Colin Watson <cjwatson@ubuntu.com>
Fix in-tree --platform=none Fix in-tree --platform=none

2
grub-core/loader/arm/linux.c
View file

@ -396,7 +396,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
{ {
grub_file_t file; grub_file_t file;
grub_size_t size = 0; 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) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

2
grub-core/loader/arm64/linux.c
View file

@ -328,7 +328,7 @@ static grub_err_t
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[]) 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; int initrd_size, initrd_pages;
void *initrd_mem = NULL; void *initrd_mem = NULL;

2
grub-core/loader/i386/linux.c
View file

@ -1050,7 +1050,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
grub_addr_t addr_min, addr_max; grub_addr_t addr_min, addr_max;
grub_addr_t addr; grub_addr_t addr;
grub_err_t err; 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) if (argc == 0)
{ {

2
grub-core/loader/i386/pc/linux.c
View file

@ -388,7 +388,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
grub_uint8_t *initrd_chunk; grub_uint8_t *initrd_chunk;
grub_addr_t initrd_addr; grub_addr_t initrd_addr;
grub_err_t err; 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) if (argc == 0)
{ {

2
grub-core/loader/ia64/efi/linux.c
View file

@ -568,7 +568,7 @@ static grub_err_t
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[]) 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) if (argc == 0)
{ {

2
grub-core/loader/mips/linux.c
View file

@ -415,7 +415,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
void *initrd_src; void *initrd_src;
grub_addr_t initrd_dest; grub_addr_t initrd_dest;
grub_err_t err; 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) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

2
grub-core/loader/powerpc/ieee1275/linux.c
View file

@ -333,7 +333,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
grub_size_t size = 0; grub_size_t size = 0;
grub_addr_t first_addr; grub_addr_t first_addr;
grub_addr_t 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) if (argc == 0)
{ {

2
grub-core/loader/sparc64/ieee1275/linux.c
View file

@ -373,7 +373,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
grub_addr_t paddr; grub_addr_t paddr;
grub_addr_t addr; grub_addr_t addr;
int ret; int ret;
struct grub_linux_initrd_context initrd_ctx = { 0, }; struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
if (argc == 0) if (argc == 0)
{ {