summaryrefslogtreecommitdiff
path: root/netboot.c
diff options
context:
space:
mode:
Diffstat (limited to 'netboot.c')
-rw-r--r--netboot.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/netboot.c b/netboot.c
index ec13c64a..3f5c5198 100644
--- a/netboot.c
+++ b/netboot.c
@@ -13,8 +13,6 @@
#include "shim.h"
-#include <string.h>
-
#define ntohs(x) __builtin_bswap16(x) /* supported both by GCC and clang */
#define htons(x) ntohs(x)
@@ -174,7 +172,7 @@ static BOOLEAN extract_tftp_info(CHAR8 *url)
// to check against str2ip6() errors
memset(ip6inv, 0, sizeof(ip6inv));
- if (strncmp((UINT8 *)url, (UINT8 *)"tftp://", 7)) {
+ if (strncmp((const char *)url, (const char *)"tftp://", 7)) {
console_print(L"URLS MUST START WITH tftp://\n");
return FALSE;
}
@@ -260,7 +258,7 @@ static EFI_STATUS parseDhcp4()
pkt_v4 = &pxe->Mode->PxeReply.Dhcpv4;
}
- INTN dir_len = strnlena((CHAR8 *)pkt_v4->BootpBootFile, 127);
+ INTN dir_len = strnlen((CHAR8 *)pkt_v4->BootpBootFile, 127);
INTN i;
UINT8 *dir = pkt_v4->BootpBootFile;
@@ -276,19 +274,19 @@ static EFI_STATUS parseDhcp4()
return EFI_OUT_OF_RESOURCES;
if (dir_len > 0) {
- strncpya(full_path, (CHAR8 *)dir, dir_len);
+ strncpy(full_path, (CHAR8 *)dir, dir_len);
if (full_path[dir_len-1] == '/' && template[0] == '/')
full_path[dir_len-1] = '\0';
}
if (dir_len == 0 && dir[0] != '/' && template[0] == '/')
template_ofs++;
- strcata(full_path, template + template_ofs);
+ strcat(full_path, template + template_ofs);
memcpy(&tftp_addr.v4, pkt_v4->BootpSiAddr, 4);
return EFI_SUCCESS;
}
-EFI_STATUS parseNetbootinfo(EFI_HANDLE image_handle)
+EFI_STATUS parseNetbootinfo(EFI_HANDLE image_handle UNUSED)
{
EFI_STATUS efi_status;
@@ -309,7 +307,7 @@ EFI_STATUS parseNetbootinfo(EFI_HANDLE image_handle)
return efi_status;
}
-EFI_STATUS FetchNetbootimage(EFI_HANDLE image_handle, VOID **buffer, UINT64 *bufsiz)
+EFI_STATUS FetchNetbootimage(EFI_HANDLE image_handle UNUSED, VOID **buffer, UINT64 *bufsiz)
{
EFI_STATUS efi_status;
EFI_PXE_BASE_CODE_TFTP_OPCODE read = EFI_PXE_BASE_CODE_TFTP_READ_FILE;