From dbb93abca92ff895c6e0c4564f8f44ef45587871 Mon Sep 17 00:00:00 2001 From: jief Date: Tue, 7 Nov 2023 11:29:52 +0100 Subject: [PATCH] Remove unnecessary casts. --- rEFIt_UEFI/Platform/Nvram.cpp | 2 +- rEFIt_UEFI/Settings/ConfigManager.cpp | 6 +++--- rEFIt_UEFI/refit/main.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rEFIt_UEFI/Platform/Nvram.cpp b/rEFIt_UEFI/Platform/Nvram.cpp index 8a4686509..8f6bc8b62 100755 --- a/rEFIt_UEFI/Platform/Nvram.cpp +++ b/rEFIt_UEFI/Platform/Nvram.cpp @@ -907,7 +907,7 @@ LoadNvramPlist( // // load nvram.plist // - Status = egLoadFile(RootDir, NVRAMPlistPath, (UINT8**)&NvramPtr, &Size); + Status = egLoadFile(RootDir, NVRAMPlistPath, &NvramPtr, &Size); if(EFI_ERROR(Status)) { DBG(" not present\n"); return Status; diff --git a/rEFIt_UEFI/Settings/ConfigManager.cpp b/rEFIt_UEFI/Settings/ConfigManager.cpp index f73533faf..8be286bd1 100644 --- a/rEFIt_UEFI/Settings/ConfigManager.cpp +++ b/rEFIt_UEFI/Settings/ConfigManager.cpp @@ -483,7 +483,7 @@ EFI_STATUS LoadPlist(const XStringW& ConfName, C* plist) { EFI_STATUS Status = EFI_NOT_FOUND; UINTN Size = 0; - CHAR8* ConfigPtr = NULL; + UINT8* ConfigPtr = NULL; // XStringW ConfigPlistPath; // XStringW ConfigOemPath; @@ -501,7 +501,7 @@ EFI_STATUS LoadPlist(const XStringW& ConfName, C* plist) if ( selfOem.oemDirExists() ) { configPlistPath = SWPrintf("%ls\\%ls.plist", selfOem.getOemFullPath().wc_str(), ConfName.wc_str()); if (FileExists (&selfOem.getOemDir(), configFilename)) { - Status = egLoadFile(&selfOem.getOemDir(), configFilename.wc_str(), (UINT8**)&ConfigPtr, &Size); + Status = egLoadFile(&selfOem.getOemDir(), configFilename.wc_str(), &ConfigPtr, &Size); if (EFI_ERROR(Status)) { DBG("Cannot find %ls at path (%s): '%ls', trying '%ls'\n", configFilename.wc_str(), efiStrError(Status), selfOem.getOemFullPath().wc_str(), self.getCloverDirFullPath().wc_str()); }else{ @@ -512,7 +512,7 @@ EFI_STATUS LoadPlist(const XStringW& ConfName, C* plist) if ( !selfOem.oemDirExists() || EFI_ERROR(Status)) { configPlistPath = SWPrintf("%ls\\%ls.plist", self.getCloverDirFullPath().wc_str(), ConfName.wc_str()); if ( FileExists(&self.getCloverDir(), configFilename.wc_str())) { - Status = egLoadFile(&self.getCloverDir(), configFilename.wc_str(), (UINT8**)&ConfigPtr, &Size); + Status = egLoadFile(&self.getCloverDir(), configFilename.wc_str(), &ConfigPtr, &Size); } if (EFI_ERROR(Status)) { DBG("Cannot find %ls at path '%ls' : %s\n", configFilename.wc_str(), self.getCloverDirFullPath().wc_str(), efiStrError(Status)); diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp index 3da6b97ac..d55b772c7 100644 --- a/rEFIt_UEFI/refit/main.cpp +++ b/rEFIt_UEFI/refit/main.cpp @@ -2522,7 +2522,7 @@ GetListOfThemes () EFI_FILE_INFO *DirEntry; XStringW ThemeTestPath; EFI_FILE *ThemeTestDir = NULL; - CHAR8 *ThemePtr = NULL; + UINT8 *ThemePtr = NULL; UINTN Size = 0; DbgHeader("GetListOfThemes"); @@ -2542,9 +2542,9 @@ GetListOfThemes () DBG("- [%02zu]: %ls", ThemeNameArray.size(), DirEntry->FileName); Status = self.getThemesDir().Open(&self.getThemesDir(), &ThemeTestDir, DirEntry->FileName, EFI_FILE_MODE_READ, 0); if (!EFI_ERROR(Status)) { - Status = egLoadFile(ThemeTestDir, CONFIG_THEME_FILENAME, (UINT8**)&ThemePtr, &Size); + Status = egLoadFile(ThemeTestDir, CONFIG_THEME_FILENAME, &ThemePtr, &Size); if (EFI_ERROR(Status) || (ThemePtr == NULL) || (Size == 0)) { - Status = egLoadFile(ThemeTestDir, CONFIG_THEME_SVG, (UINT8**)&ThemePtr, &Size); + Status = egLoadFile(ThemeTestDir, CONFIG_THEME_SVG, &ThemePtr, &Size); if (EFI_ERROR(Status)) { Status = EFI_NOT_FOUND; DBG(" - bad theme because %ls nor %ls can't be load", CONFIG_THEME_FILENAME, CONFIG_THEME_SVG);