remove EfiStrDuplicate not used anymore.

Comment out MainConfigName from SETTINGS_DATA. Not used.
This commit is contained in:
jief666 2020-08-13 15:57:05 +03:00
parent 8947e66382
commit 220b450d60
5 changed files with 4 additions and 42 deletions

View File

@ -8231,7 +8231,7 @@ XBuffer<UINT8> SETTINGS_DATA::serialize() const
// Multi-config
xb.ncat(&ConfigName, sizeof(ConfigName));
xb.ncat(&pad31, sizeof(pad31));
xb.cat(MainConfigName);
xb.cat(uintptr_t(0)); // MainConfigName was a CHAR16*
//Drivers
xb.cat(BlackListCount);

View File

@ -488,7 +488,7 @@ public:
// Multi-config
CHAR16 ConfigName[30];
UINT8 pad31[4];
CHAR16 *MainConfigName;
// XString8 MainConfigName;
//Drivers
INTN BlackListCount;
@ -602,7 +602,7 @@ public:
LegacyBoot{0}, LegacyBiosDefaultEntry(0), HWP(0), TDP(0), HWPValue(0), HVHideStrings(0), HVCount(0), KernelAndKextPatches(), KextPatchesAllowed(0),
KernelPatchesAllowed(0), AirportBridgeDeviceName{0}, KbdPrevLang(0), PointerEnabled(0), PointerSpeed(0), DoubleClickTime(0), PointerMirror(0), CustomBoot(0), CustomLogo(0),
RefCLK(0), RtMLB(0), RtROM(0), RtROMLen(0), CsrActiveConfig(0), BooterConfig(0), BooterCfgStr{0}, DisableCloverHotkeys(0), NeverDoRecovery(0),
ConfigName{0}, MainConfigName(0), BlackListCount(0), BlackList(0), RPlt{0}, RBr{0}, EPCI{0}, REV{0}, Rtc8Allowed(0),
ConfigName{0}, /*MainConfigName(0),*/ BlackListCount(0), BlackList(0), RPlt{0}, RBr{0}, EPCI{0}, REV{0}, Rtc8Allowed(0),
ForceHPET(0), ResetHDA(0), PlayAsync(0), DisableFunctions(0), PatchDsdtNum(0), PatchDsdtFind(0), LenToFind(0), PatchDsdtReplace(0), LenToReplace(0), DebugDSDT(0), SlpWak(0), UseIntelHDMI(0),
AFGLowPowerState(0), PNLF_UID(0), ACPIDropTables(0), DisableEntryScan(0), DisableToolScan(0), ShowHiddenEntries(0), KernelScan(0), LinuxScan(0), CustomEntries(0),
CustomLegacy(0), CustomTool(0), NrAddProperties(0), AddProperties(0), BlockKexts{0}, SortedACPICount(0), SortedACPI(0), DisabledAMLCount(0), DisabledAML(0),

View File

@ -127,32 +127,7 @@ EfiLibFileSystemVolumeLabelInfo (
return returnValue;
}
/**
Duplicate a string.
@param Src The source.
@return A new string which is duplicated copy of the source.
@retval NULL If there is not enough memory.
**/
CHAR16 *
EfiStrDuplicate (
IN CONST CHAR16 *Src
)
{
CHAR16 *Dest;
UINTN Size;
Size = StrSize (Src); //at least 2bytes
Dest = (__typeof__(Dest))AllocatePool (Size);
// ASSERT (Dest != NULL);
if (Dest != NULL) {
CopyMem(Dest, Src, Size);
}
return Dest;
}
//Compare strings case insensitive
// return 0 if strings are equal not accounting match case
INTN

View File

@ -63,19 +63,6 @@ EfiLibFileSystemVolumeLabelInfo (
IN EFI_FILE_HANDLE FHand
);
/**
Duplicate a string.
@param Src The source.
@return A new string which is duplicated copy of the source.
@retval NULL If there is not enough memory.
**/
CHAR16 *
EfiStrDuplicate (
IN CONST CHAR16 *Src
);
//Compare strings case insensitive
// return 0 if strings are equal not accounting match case

View File

@ -1984,7 +1984,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
gConfigDict[0] ? L"config": L"",
(gConfigDict[0] && gConfigDict[1]) ? L" + ": L"",
!gConfigDict[1] ? L"": (ConfName.notEmpty() ? ConfName.wc_str() : L"Load Options"));
gSettings.MainConfigName = EfiStrDuplicate(gSettings.ConfigName);
//gSettings.MainConfigName.takeValueFrom(gSettings.ConfigName);
gSettings.PointerEnabled = TRUE;
gSettings.PointerSpeed = 2;