Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-23 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix AddListElement

Browse Source 
Remove non-const casts
This commit is contained in:
Jief L 2020-02-21 08:29:22 +03:00
parent 241a55ce69
commit c6499afa83
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rEFIt_UEFI/refit/lib.cpp
View File

@ -342,7 +342,7 @@ VOID CreateList(OUT VOID ***ListPtr, OUT UINTN *ElementCount, IN UINTN InitialEl
*ElementCount = InitialElementCount; *ElementCount = InitialElementCount;
if (*ElementCount > 0) { if (*ElementCount > 0) {
AllocateCount = (*ElementCount + 7) & ~7; // next multiple of 8 AllocateCount = (*ElementCount + 7) & ~7; // next multiple of 8
**ListPtr = AllocatePool(sizeof(VOID *) * AllocateCount); *ListPtr = (__typeof_am__(*ListPtr))AllocatePool(sizeof(VOID *) * AllocateCount);
} else { } else {
*ListPtr = NULL; *ListPtr = NULL;
} }
@ -355,9 +355,9 @@ VOID AddListElement(IN OUT VOID ***ListPtr, IN OUT UINTN *ElementCount, IN VOID
if ((*ElementCount & 7) == 0) { if ((*ElementCount & 7) == 0) {
AllocateCount = *ElementCount + 8; AllocateCount = *ElementCount + 8;
if (*ElementCount == 0) if (*ElementCount == 0)
**ListPtr = AllocatePool(sizeof(VOID *) * AllocateCount); *ListPtr = (__typeof_am__(*ListPtr))AllocatePool(sizeof(VOID *) * AllocateCount);
else else
**ListPtr = EfiReallocatePool((VOID *)*ListPtr, sizeof(VOID *) * (*ElementCount), sizeof(VOID *) * AllocateCount); *ListPtr = (__typeof_am__(*ListPtr))EfiReallocatePool((VOID *)*ListPtr, sizeof(VOID *) * (*ElementCount), sizeof(VOID *) * AllocateCount);
} }
(*ListPtr)[*ElementCount] = NewElement; (*ListPtr)[*ElementCount] = NewElement;
(*ElementCount)++; (*ElementCount)++;
@ -1371,7 +1371,7 @@ BOOLEAN FileExists(IN CONST EFI_FILE *Root, IN CONST CHAR16 *RelativePath)
EFI_STATUS Status; EFI_STATUS Status;
EFI_FILE *TestFile = NULL; EFI_FILE *TestFile = NULL;
Status = Root->Open((EFI_FILE_PROTOCOL*)Root, &TestFile, (CHAR16*)RelativePath, EFI_FILE_MODE_READ, 0); Status = Root->Open(Root, &TestFile, RelativePath, EFI_FILE_MODE_READ, 0);
if (Status == EFI_SUCCESS) { if (Status == EFI_SUCCESS) {
if (TestFile && TestFile->Close) { if (TestFile && TestFile->Close) {
TestFile->Close(TestFile); TestFile->Close(TestFile);
@ -1389,7 +1389,7 @@ BOOLEAN DeleteFile(IN EFI_FILE *Root, IN CONST CHAR16 *RelativePath)
//DBG("DeleteFile: %s\n", RelativePath); //DBG("DeleteFile: %s\n", RelativePath);
// open file for read/write to see if it exists, need write for delete // open file for read/write to see if it exists, need write for delete
Status = Root->Open(Root, &File, (CHAR16*)RelativePath, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE, 0); Status = Root->Open(Root, &File, RelativePath, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE, 0);
//DBG(" Open: %r\n", Status); //DBG(" Open: %r\n", Status);
if (Status == EFI_SUCCESS) { if (Status == EFI_SUCCESS) {
// exists - check if it is a file // exists - check if it is a file
@ -1487,7 +1487,7 @@ VOID DirIterOpen(IN EFI_FILE *BaseDir, IN CONST CHAR16 *RelativePath OPTIONAL, O
DirIter->DirHandle = BaseDir; DirIter->DirHandle = BaseDir;
DirIter->CloseDirHandle = FALSE; DirIter->CloseDirHandle = FALSE;
} else { } else {
DirIter->LastStatus = BaseDir->Open(BaseDir, &(DirIter->DirHandle), (CHAR16*)RelativePath, EFI_FILE_MODE_READ, 0); DirIter->LastStatus = BaseDir->Open(BaseDir, &(DirIter->DirHandle), RelativePath, EFI_FILE_MODE_READ, 0);
DirIter->CloseDirHandle = EFI_ERROR(DirIter->LastStatus) ? FALSE : TRUE; DirIter->CloseDirHandle = EFI_ERROR(DirIter->LastStatus) ? FALSE : TRUE;
} }
DirIter->LastFileInfo = NULL; DirIter->LastFileInfo = NULL;
@ -1549,7 +1549,7 @@ MetaiMatch (
//return FALSE; //return FALSE;
return TRUE; return TRUE;
} }
return mUnicodeCollation->MetaiMatch (mUnicodeCollation, (CHAR16*)String, (CHAR16*)Pattern); return mUnicodeCollation->MetaiMatch (mUnicodeCollation, String, Pattern);
} }