chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
spx 2011-08-03 23:25:52 +00:00
parent 02251ed412
commit d300d469b0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Measure.cpp
View File

@ -227,29 +227,29 @@ const WCHAR* CMeasure::CheckSubstitute(const WCHAR* buffer)
{ {
str = buffer; str = buffer;
for (size_t i = 0, isize = m_Substitute.size(); i < isize; i++) for (size_t i = 0, isize = m_Substitute.size(); i < isize; ++i)
{ {
if (str.empty() && m_Substitute[i].first.empty()) if (!m_Substitute[i].first.empty())
{
MakePlainSubstitute(str, i);
}
else if (str.empty())
{ {
// Empty result and empty substitute -> use second // Empty result and empty substitute -> use second
str = m_Substitute[i].second; str = m_Substitute[i].second;
} }
else if (!m_Substitute[i].first.empty())
{
MakePlainSubstitute(str, i);
}
} }
} }
else // Contains a RegEx else // Contains a RegEx
{ {
std::string utf8str = ConvertToUTF8(buffer); std::string utf8str = ConvertToUTF8(buffer);
int* ovector = new int[OVECCOUNT];
for (size_t i = 0, isize = m_Substitute.size() ; i < isize ; i++) for (size_t i = 0, isize = m_Substitute.size() ; i < isize ; ++i)
{ {
pcre* re; pcre* re;
const char* error; const char* error;
int erroffset; int erroffset;
int ovector[OVECCOUNT];
int rc; int rc;
int flags = PCRE_UTF8; int flags = PCRE_UTF8;
int offset = 0; int offset = 0;
@ -290,7 +290,7 @@ const WCHAR* CMeasure::CheckSubstitute(const WCHAR* buffer)
if (rc > 1) if (rc > 1)
{ {
for (int j = rc - 1 ; j >= 0 ; j--) for (int j = rc - 1 ; j >= 0 ; --j)
{ {
size_t new_start = ovector[2*j]; size_t new_start = ovector[2*j];
size_t in_length = ovector[2*j+1] - ovector[2*j]; size_t in_length = ovector[2*j+1] - ovector[2*j];
@ -320,6 +320,8 @@ const WCHAR* CMeasure::CheckSubstitute(const WCHAR* buffer)
} }
} }
delete [] ovector;
str = ConvertUTF8ToWide(utf8str.c_str()); str = ConvertUTF8ToWide(utf8str.c_str());
} }