Remove unused var

Rename '10.x' folder just '10' to be more consistent.
This commit is contained in:
jief 2019-12-13 12:56:57 +01:00
parent d1abb9167c
commit 7ef7e4055d
2 changed files with 11 additions and 12 deletions

View File

@ -445,20 +445,20 @@ EFI_STATUS LoadKexts(IN LOADER_ENTRY *Entry)
DBG("GetOtherKextsDir(FALSE) return NULL\n"); DBG("GetOtherKextsDir(FALSE) return NULL\n");
} }
// Add kext from 10.x // Add kext from 10
{ {
CHAR16 OSAllVersionKextsDir[1024]; CHAR16 OSAllVersionKextsDir[1024];
UnicodeSPrint(OSAllVersionKextsDir, sizeof(OSAllVersionKextsDir), L"%s\\kexts\\10.x", OEMPath); UnicodeSPrint(OSAllVersionKextsDir, sizeof(OSAllVersionKextsDir), L"%s\\kexts\\10", OEMPath);
AddKexts(Entry, OSAllVersionKextsDir, L"10.x", archCpuType); AddKexts(Entry, OSAllVersionKextsDir, L"10", archCpuType);
CHAR16 DirName[256]; CHAR16 DirName[256];
if (OSTYPE_IS_OSX_INSTALLER(Entry->LoaderType)) { if (OSTYPE_IS_OSX_INSTALLER(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"10.x_install"); UnicodeSPrint(DirName, sizeof(DirName), L"10_install");
} else { } else {
if (OSTYPE_IS_OSX_RECOVERY(Entry->LoaderType)) { if (OSTYPE_IS_OSX_RECOVERY(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"10.x_recovery"); UnicodeSPrint(DirName, sizeof(DirName), L"10_recovery");
}else{ }else{
UnicodeSPrint(DirName, sizeof(DirName), L"10.x_normal"); UnicodeSPrint(DirName, sizeof(DirName), L"10_normal");
} }
} }
CHAR16 DirPath[1024]; CHAR16 DirPath[1024];

View File

@ -4673,7 +4673,6 @@ LOADER_ENTRY *SubMenuKextInjectMgmt(LOADER_ENTRY *Entry)
CHAR16 *kextDir = NULL; CHAR16 *kextDir = NULL;
UINTN i; UINTN i;
CHAR8 ShortOSVersion[8]; CHAR8 ShortOSVersion[8];
CHAR16 *UniSysVer = NULL;
CHAR8 *ChosenOS = Entry->OSVersion; CHAR8 *ChosenOS = Entry->OSVersion;
NewEntry((REFIT_MENU_ENTRY**) &SubEntry, &SubScreen, ActionEnter, SCREEN_SYSTEM, "Block injected kexts->"); NewEntry((REFIT_MENU_ENTRY**) &SubEntry, &SubScreen, ActionEnter, SCREEN_SYSTEM, "Block injected kexts->");
@ -4697,20 +4696,20 @@ LOADER_ENTRY *SubMenuKextInjectMgmt(LOADER_ENTRY *Entry)
L"Block injected kexts for target version of macOS: %a", L"Block injected kexts for target version of macOS: %a",
ShortOSVersion)); ShortOSVersion));
// Add kext from 10.x // Add kext from 10
{ {
AddMenuEntry(SubScreen, SubMenuKextBlockInjection(L"10.x")); AddMenuEntry(SubScreen, SubMenuKextBlockInjection(L"10"));
CHAR16 DirName[256]; CHAR16 DirName[256];
if (OSTYPE_IS_OSX_INSTALLER(Entry->LoaderType)) { if (OSTYPE_IS_OSX_INSTALLER(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"10.x_install"); UnicodeSPrint(DirName, sizeof(DirName), L"10_install");
} }
else { else {
if (OSTYPE_IS_OSX_RECOVERY(Entry->LoaderType)) { if (OSTYPE_IS_OSX_RECOVERY(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"10.x_recovery"); UnicodeSPrint(DirName, sizeof(DirName), L"10_recovery");
} }
else { else {
UnicodeSPrint(DirName, sizeof(DirName), L"10.x_normal"); UnicodeSPrint(DirName, sizeof(DirName), L"10_normal");
} }
} }
AddMenuEntry(SubScreen, SubMenuKextBlockInjection(DirName)); AddMenuEntry(SubScreen, SubMenuKextBlockInjection(DirName));