diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2013-09-22 22:25:47 -0700 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2013-09-24 12:05:38 -0400 |
| commit | 0f603fa81af99e0ed2c418cf9612314d9eec7019 (patch) | |
| tree | 1b35697224affd1ec2a2196a10fc98e4d4bed5b8 /netboot.c | |
| parent | 3756f0b8e5cf0d1c0e430b060dc1558711daf53f (diff) | |
| download | efi-boot-shim-0f603fa81af99e0ed2c418cf9612314d9eec7019.tar.gz efi-boot-shim-0f603fa81af99e0ed2c418cf9612314d9eec7019.zip | |
More consistent types, fewer casts
Diffstat (limited to 'netboot.c')
| -rw-r--r-- | netboot.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -141,11 +141,11 @@ try_again: return rc; } -static char *get_v6_bootfile_url(EFI_PXE_BASE_CODE_DHCPV6_PACKET *pkt) +static CHAR8 *get_v6_bootfile_url(EFI_PXE_BASE_CODE_DHCPV6_PACKET *pkt) { void *optr; EFI_DHCP6_PACKET_OPTION *option; - char *url; + CHAR8 *url; UINT32 urllen; optr = pkt->DhcpOptions; @@ -224,7 +224,7 @@ static UINT8 *str2ip6(char *str) return (UINT8 *)ip; } -static BOOLEAN extract_tftp_info(char *url) +static BOOLEAN extract_tftp_info(CHAR8 *url) { CHAR8 *start, *end; char ip6str[128]; @@ -234,7 +234,7 @@ static BOOLEAN extract_tftp_info(char *url) Print(L"URLS MUST START WITH tftp://\n"); return FALSE; } - start = (CHAR8 *)url + 7; + start = url + 7; if (*start != '[') { Print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n"); return FALSE; @@ -269,8 +269,7 @@ static BOOLEAN extract_tftp_info(char *url) static EFI_STATUS parseDhcp6() { EFI_PXE_BASE_CODE_DHCPV6_PACKET *packet = (EFI_PXE_BASE_CODE_DHCPV6_PACKET *)&pxe->Mode->DhcpAck.Raw; - char *bootfile_url; - + CHAR8 *bootfile_url; bootfile_url = get_v6_bootfile_url(packet); if (!bootfile_url) |