1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 20:12:21 +02:00

Remove stricmp

This commit is contained in:
Brian Fiete 2021-12-28 14:57:14 -05:00
parent 1e687cc062
commit adf282dfa7

View file

@ -1677,7 +1677,6 @@ namespace IDE.ui
} }
if (hasUnderscore) if (hasUnderscore)
//return strnicmp(filter, entry, filterLen) == 0;
return (entryLen >= filterLen) && (String.Compare(entryPtr, filterLen, filterPtr, filterLen, true) == 0); return (entryLen >= filterLen) && (String.Compare(entryPtr, filterLen, filterPtr, filterLen, true) == 0);
char8[256] initialStr; char8[256] initialStr;
@ -1698,8 +1697,6 @@ namespace IDE.ui
if ((entryIdx == 0) || (prevWasUnderscore) || (entryC.IsUpper) || (entryC.IsDigit)) if ((entryIdx == 0) || (prevWasUnderscore) || (entryC.IsUpper) || (entryC.IsDigit))
{ {
/*if (strnicmp(filter, entry + entryIdx, filterLen) == 0)
return true;*/
if ((entryLen - entryIdx >= filterLen) && (String.Compare(entryPtr + entryIdx, filterLen, filterPtr, filterLen, true) == 0)) if ((entryLen - entryIdx >= filterLen) && (String.Compare(entryPtr + entryIdx, filterLen, filterPtr, filterLen, true) == 0))
return true; return true;
if (checkInitials) if (checkInitials)
@ -1715,14 +1712,8 @@ namespace IDE.ui
return false; return false;
int initialLen = initialStrP - (char8*)&initialStr; int initialLen = initialStrP - (char8*)&initialStr;
return (initialLen >= filterLen) && (String.Compare(&initialStr, filterLen, filterPtr, filterLen, true) == 0); return (initialLen >= filterLen) && (String.Compare(&initialStr, filterLen, filterPtr, filterLen, true) == 0);
//*(initialStrP++) = 0;
//return strnicmp(filter, initialStr, filterLen) == 0;
} }
[LinkName("_stricmp")]
static extern int32 stricmp(char8* lhs, char8* rhs);
void UpdateData(String selectString, bool changedAfterInfo) void UpdateData(String selectString, bool changedAfterInfo)
{ {
if ((mInsertEndIdx != -1) && (mInsertEndIdx < mInsertStartIdx)) if ((mInsertEndIdx != -1) && (mInsertEndIdx < mInsertStartIdx))
@ -1808,7 +1799,7 @@ namespace IDE.ui
else if (left.mScore < right.mScore) else if (left.mScore < right.mScore)
return 1; return 1;
else else
return ((stricmp(left.mEntryDisplay.CStr(), right.mEntryDisplay.CStr()) < 0) ? -1 : 1); return String.Compare(left.mEntryDisplay, right.mEntryDisplay, true);
}); });
for (int i < mAutoCompleteListWidget.mEntryList.Count) for (int i < mAutoCompleteListWidget.mEntryList.Count)