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

ofnet: Fix build regression in grub_ieee1275_parse_bootpath()

Browse source 
The grub_ieee1275_parse_bootpath() function (commit a661a32, ofnet: Initialize
structs in bootpath parser) introduces a build regression on SPARC:

cc1: warnings being treated as errors
net/drivers/ieee1275/ofnet.c: In function 'grub_ieee1275_parse_bootpath':
net/drivers/ieee1275/ofnet.c:156: error: missing initializer
net/drivers/ieee1275/ofnet.c:156: error: (near initialization for 'client_addr.type')
net/drivers/ieee1275/ofnet.c:156: error: missing initializer
net/drivers/ieee1275/ofnet.c:156: error: (near initialization for 'gateway_addr.type')
net/drivers/ieee1275/ofnet.c:156: error: missing initializer
net/drivers/ieee1275/ofnet.c:156: error: (near initialization for 'subnet_mask.type')
net/drivers/ieee1275/ofnet.c:157: error: missing initializer
net/drivers/ieee1275/ofnet.c:157: error: (near initialization for 'hw_addr.type')
make[3]: *** [net/drivers/ieee1275/ofnet_module-ofnet.o] Error 1

Initialize the entire structure.

More info can be found here:
  http://lists.gnu.org/archive/html/grub-devel/2018-03/msg00034.html

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Eric Snowberg 2018-11-27 15:17:26 -08:00 committed by Daniel Kiper
parent 3861286486
commit 29157553b7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub-core/net/drivers/ieee1275/ofnet.c
View file

@ -153,8 +153,8 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
char *comma_char = 0; char *comma_char = 0;
char *equal_char = 0; char *equal_char = 0;
grub_size_t field_counter = 0; grub_size_t field_counter = 0;
grub_net_network_level_address_t client_addr = {}, gateway_addr = {}, subnet_mask = {}; grub_net_network_level_address_t client_addr = {0, {0}, 0}, gateway_addr = {0, {0}, 0}, subnet_mask = {0, {0}, 0};
grub_net_link_level_address_t hw_addr = {}; grub_net_link_level_address_t hw_addr = {0, {{0, 0, 0, 0, 0, 0}}};
grub_net_interface_flags_t flags = 0; grub_net_interface_flags_t flags = 0;
struct grub_net_network_level_interface *inter = NULL; struct grub_net_network_level_interface *inter = NULL;
grub_uint16_t vlantag = 0; grub_uint16_t vlantag = 0;