Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove dead code from wxMatchWild (patch 1445809)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-12 13:39:41 +00:00
parent 20aa779e3e
commit b931e275f5
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/filefn.cpp
View File

@@ -1802,6 +1802,7 @@ bool wxIsWild( const wxString& pattern )
* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU> * Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
* *
* The match procedure is public domain code (from ircII's reg.c) * The match procedure is public domain code (from ircII's reg.c)
* but modified to suit our tastes (RN: No "%" syntax I guess)
*/ */
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
@@ -1815,11 +1816,8 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
const wxChar *m = pat.c_str(), const wxChar *m = pat.c_str(),
*n = text.c_str(), *n = text.c_str(),
*ma = NULL, *ma = NULL,
*na = NULL, *na = NULL;
*mp = NULL,
*np = NULL;
int just = 0, int just = 0,
pcount = 0,
acount = 0, acount = 0,
count = 0; count = 0;
@@ -1837,7 +1835,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
ma = ++m; ma = ++m;
na = n; na = n;
just = 1; just = 1;
mp = NULL;
acount = count; acount = count;
} }
else if (*m == wxT('?')) else if (*m == wxT('?'))
@@ -1880,8 +1877,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
if (*m == *n) if (*m == *n)
{ {
m++; m++;
if (*n == wxT(' '))
mp = NULL;
count++; count++;
n++; n++;
} }
@@ -1898,19 +1893,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
*/ */
if (!*n) if (!*n)
return false; return false;
if (mp)
{
m = mp;
if (*np == wxT(' '))
{
mp = NULL;
goto check_percent;
}
n = ++np;
count = pcount;
}
else
check_percent:
if (ma) if (ma)
{ {