From 01d89e9c29e2a44a942eb53ace06cd10ba8d1853 Mon Sep 17 00:00:00 2001 From: jljusten Date: Sat, 10 Sep 2011 00:06:53 +0000 Subject: [PATCH] NetworkPkg/UefiPxeBcDxe: Fix GCC build issue The call to AsciiStrStr on line 330 requires a CHAR8* input, and since strings are being parsed, CHAR8* is more appropriate for BootFileName and BootFileNamePtr. Signed-off-by: jljusten Reviewed-by: lgrosenb git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12321 6f19259b-4bc3-4df7-8a09-765794883524 --- NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c index c3ae23ec82..3e59f3f233 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c @@ -232,8 +232,8 @@ PxeBcExtractBootFileUrl ( ) { UINT16 PrefixLen; - UINT8 *BootFileNamePtr; - UINT8 *BootFileName; + CHAR8 *BootFileNamePtr; + CHAR8 *BootFileName; UINT16 BootFileNameLen; CHAR8 *TmpStr; CHAR8 TmpChar; @@ -314,7 +314,7 @@ PxeBcExtractBootFileUrl ( // // Get the part of BOOTFILE_NAME string. // - BootFileNamePtr = (UINT8*)((UINTN)ServerAddress + 1); + BootFileNamePtr = (CHAR8*)((UINTN)ServerAddress + 1); if (*BootFileNamePtr != PXEBC_TFTP_URL_SEPARATOR) { FreePool (TmpStr); return EFI_INVALID_PARAMETER; @@ -337,12 +337,12 @@ PxeBcExtractBootFileUrl ( // // Extract boot file name from URL. // - BootFileName = (UINT8 *) AllocateZeroPool (BootFileNameLen); + BootFileName = (CHAR8 *) AllocateZeroPool (BootFileNameLen); if (BootFileName == NULL) { FreePool (TmpStr); return EFI_OUT_OF_RESOURCES; } - *FileName = BootFileName; + *FileName = (UINT8*) BootFileName; // // Decode percent-encoding in boot file name.