From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 20 Jul 2020 12:24:02 -0400 Subject: [PATCH] Fix const char ** pointers in grub-core/net/efi/ip4_config.c This will need to get folded back in the right place on the next rebase, but it's before "Make grub_strtol() "end" pointers have safer const qualifiers" currently, so for now I'm leaving it here instead of merging it back with the original patch. Signed-off-by: Peter Jones --- grub-core/net/efi/ip4_config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c index 9725e928f..cb880fc3e 100644 --- a/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c @@ -61,7 +61,8 @@ int grub_efi_string_to_ip4_address (const char *val, grub_efi_ipv4_address_t *address, const char **rest) { grub_uint32_t newip = 0; - int i, ncolon = 0; + grub_size_t i; + int ncolon = 0; const char *ptr = val; /* Check that is not an IPv6 address */ @@ -78,7 +79,7 @@ grub_efi_string_to_ip4_address (const char *val, grub_efi_ipv4_address_t *addres for (i = 0; i < 4; i++) { unsigned long t; - t = grub_strtoul (ptr, (char **) &ptr, 0); + t = grub_strtoul (ptr, &ptr, 0); if (grub_errno) { grub_errno = GRUB_ERR_NONE;