Rename PatternToBytesAndMask to PatternToMaskedBytes

This commit is contained in:
Kawe Mazidjatari 2022-06-26 17:45:54 +02:00
parent 98c43fd6c1
commit 374a44f29e
3 changed files with 3 additions and 4 deletions

View File

@ -45,7 +45,7 @@ string StringUnescape(const string& svInput);
vector<int> StringToBytes(const string& svInput, bool bNullTerminator);
vector<int> PatternToBytes(const string& svInput);
pair<vector<uint8_t>, string> PatternToBytesAndMask(const string& svInput);
pair<vector<uint8_t>, string> PatternToMaskedBytes(const string& svInput);
vector<int> IntToDigits(int iValue);
/////////////////////////////////////////////////////////////////////////////

View File

@ -110,7 +110,7 @@ CMemory CModule::FindPatternSIMD(const uint8_t* szPattern, const char* szMask) c
//-----------------------------------------------------------------------------
CMemory CModule::FindPatternSIMD(const string& svPattern) const
{
const pair patternInfo = PatternToBytesAndMask(svPattern);
const pair patternInfo = PatternToMaskedBytes(svPattern);
return FindPatternSIMD(patternInfo.first.data(), patternInfo.second.c_str());
}

View File

@ -664,10 +664,9 @@ vector<int> PatternToBytes(const string& svInput)
return vBytes;
};
///////////////////////////////////////////////////////////////////////////////
// For converting a string pattern with wildcards to an array of bytes and mask.
pair<vector<uint8_t>, string> PatternToBytesAndMask(const string& svInput)
pair<vector<uint8_t>, string> PatternToMaskedBytes(const string& svInput)
{
char* pszPatternStart = const_cast<char*>(svInput.c_str());
char* pszPatternEnd = pszPatternStart + strlen(svInput.c_str());