Skip to content

Commit 21183cc

Browse files
Hans de Goedelsandov1
authored andcommitted
ieee1275/ofnet: Fix hw_addr variable initialization
The latest gcc does not like the initializer used for the grub_net_link_level_address_t hw_addr variable: ../../grub-core/net/drivers/ieee1275/ofnet.c: In function ‘grub_ieee1275_parse_bootpath’: ../../grub-core/net/drivers/ieee1275/ofnet.c:158:3: warning: braces around scalar initializer 158 | grub_net_link_level_address_t hw_addr = {0, {{0, 0, 0, 0, 0, 0}}}; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../grub-core/net/drivers/ieee1275/ofnet.c:158:3: note: (near initialization for ‘hw_addr.len’) ../../grub-core/net/drivers/ieee1275/ofnet.c:158:3: error: braces around scalar initializer ../../grub-core/net/drivers/ieee1275/ofnet.c:158:3: note: (near initialization for ‘hw_addr.len’) ../../grub-core/net/drivers/ieee1275/ofnet.c:158:52: warning: excess elements in scalar initializer 158 | grub_net_link_level_address_t hw_addr = {0, {{0, 0, 0, 0, 0, 0}}}; ... Since we're zeroing it anyways switch to a simpler initializer to fix this. Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
1 parent 5dcfa5e commit 21183cc

File tree

1 file changed

+1
-1
lines changed
  • grub-core/net/drivers/ieee1275

1 file changed

+1
-1
lines changed

grub-core/net/drivers/ieee1275/ofnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
155155
char *equal_char = 0;
156156
grub_size_t field_counter = 0;
157157
grub_net_network_level_address_t client_addr = {0, {0}, 0}, gateway_addr = {0, {0}, 0}, subnet_mask = {0, {0}, 0};
158-
grub_net_link_level_address_t hw_addr = {0, {{0, 0, 0, 0, 0, 0}}};
158+
grub_net_link_level_address_t hw_addr = {};
159159
grub_net_interface_flags_t flags = 0;
160160
struct grub_net_network_level_interface *inter = NULL;
161161
grub_uint16_t vlantag = 0;

0 commit comments

Comments
 (0)