mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-11-12 09:54:36 +01:00
Fix AddListElement
Remove non-const casts
This commit is contained in:
parent
241a55ce69
commit
c6499afa83
@ -342,7 +342,7 @@ VOID CreateList(OUT VOID ***ListPtr, OUT UINTN *ElementCount, IN UINTN InitialEl
|
||||
*ElementCount = InitialElementCount;
|
||||
if (*ElementCount > 0) {
|
||||
AllocateCount = (*ElementCount + 7) & ~7; // next multiple of 8
|
||||
**ListPtr = AllocatePool(sizeof(VOID *) * AllocateCount);
|
||||
*ListPtr = (__typeof_am__(*ListPtr))AllocatePool(sizeof(VOID *) * AllocateCount);
|
||||
} else {
|
||||
*ListPtr = NULL;
|
||||
}
|
||||
@ -355,9 +355,9 @@ VOID AddListElement(IN OUT VOID ***ListPtr, IN OUT UINTN *ElementCount, IN VOID
|
||||
if ((*ElementCount & 7) == 0) {
|
||||
AllocateCount = *ElementCount + 8;
|
||||
if (*ElementCount == 0)
|
||||
**ListPtr = AllocatePool(sizeof(VOID *) * AllocateCount);
|
||||
*ListPtr = (__typeof_am__(*ListPtr))AllocatePool(sizeof(VOID *) * AllocateCount);
|
||||
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;
|
||||
(*ElementCount)++;
|
||||
@ -1371,7 +1371,7 @@ BOOLEAN FileExists(IN CONST EFI_FILE *Root, IN CONST CHAR16 *RelativePath)
|
||||
EFI_STATUS Status;
|
||||
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 (TestFile && TestFile->Close) {
|
||||
TestFile->Close(TestFile);
|
||||
@ -1389,7 +1389,7 @@ BOOLEAN DeleteFile(IN EFI_FILE *Root, IN CONST CHAR16 *RelativePath)
|
||||
|
||||
//DBG("DeleteFile: %s\n", RelativePath);
|
||||
// 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);
|
||||
if (Status == EFI_SUCCESS) {
|
||||
// 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->CloseDirHandle = FALSE;
|
||||
} 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->LastFileInfo = NULL;
|
||||
@ -1549,7 +1549,7 @@ MetaiMatch (
|
||||
//return FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
return mUnicodeCollation->MetaiMatch (mUnicodeCollation, (CHAR16*)String, (CHAR16*)Pattern);
|
||||
return mUnicodeCollation->MetaiMatch (mUnicodeCollation, String, Pattern);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user