haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid using the string type name as a variable name

This commit is contained in:
Marek Roszko 2021-05-01 11:13:53 -04:00
parent 3a9a85b373
commit eb343d3f8f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/string.cpp
View File

@ -520,13 +520,13 @@ bool WildCompareString( const wxString& pattern, const wxString& string_to_tst,
bool case_sensitive ) bool case_sensitive )
{ {
const wxChar* cp = NULL, * mp = NULL; const wxChar* cp = NULL, * mp = NULL;
const wxChar* wild, * string; const wxChar* wild, * str;
wxString _pattern, _string_to_tst; wxString _pattern, _string_to_tst;
if( case_sensitive ) if( case_sensitive )
{ {
wild = pattern.GetData(); wild = pattern.GetData();
string = string_to_tst.GetData(); str = string_to_tst.GetData();
} }
else else
{ {
@ -535,35 +535,36 @@ bool WildCompareString( const wxString& pattern, const wxString& string_to_tst,
_string_to_tst = string_to_tst; _string_to_tst = string_to_tst;
_string_to_tst.MakeUpper(); _string_to_tst.MakeUpper();
wild = _pattern.GetData(); wild = _pattern.GetData();
string = _string_to_tst.GetData(); str = _string_to_tst.GetData();
} }
while( ( *string ) && ( *wild != '*' ) ) while( ( *str ) && ( *wild != '*' ) )
{ {
if( ( *wild != *string ) && ( *wild != '?' ) ) if( ( *wild != *str ) && ( *wild != '?' ) )
return false; return false;
wild++; string++; wild++;
str++;
} }
while( *string ) while( *str )
{ {
if( *wild == '*' ) if( *wild == '*' )
{ {
if( !*++wild ) if( !*++wild )
return 1; return 1;
mp = wild; mp = wild;
cp = string + 1; cp = str + 1;
} }
else if( ( *wild == *string ) || ( *wild == '?' ) ) else if( ( *wild == *str ) || ( *wild == '?' ) )
{ {
wild++; wild++;
string++; str++;
} }
else else
{ {
wild = mp; wild = mp;
string = cp++; str = cp++;
} }
} }