aboutsummaryrefslogtreecommitdiff
path: root/src/SFileListFile.cpp
diff options
context:
space:
mode:
authorLadislav Zezula <zezula@volny.cz>2020-03-25 16:39:13 +0100
committerLadislav Zezula <zezula@volny.cz>2020-03-25 16:39:13 +0100
commitb60bc45088ffa77b00dffca928f99159cbcebd2f (patch)
tree971de9407c7cabcf09d1992ee7f8a084e5c3949a /src/SFileListFile.cpp
parent468292a0c4f0febef52337ba1f2d9e3f76ccac63 (diff)
CheckWildCard renamed to SFileCheckWildCard to prevent conflict with CascLib
Diffstat (limited to 'src/SFileListFile.cpp')
-rw-r--r--src/SFileListFile.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/SFileListFile.cpp b/src/SFileListFile.cpp
index 57ef7f9..752a592 100644
--- a/src/SFileListFile.cpp
+++ b/src/SFileListFile.cpp
@@ -42,6 +42,9 @@ typedef bool (*LOAD_LISTFILE)(TListFileHandle * pHandle, void * pvBuffer, DWORD
//-----------------------------------------------------------------------------
// Local functions (cache)
+// In SFileFindFile.cll
+bool SFileCheckWildCard(const char * szString, const char * szWildCard);
+
static char * CopyListLine(char * szListLine, const char * szFileName)
{
// Copy the string
@@ -579,7 +582,7 @@ static bool DoListFileSearch(TListFileCache * pCache, SFILE_FIND_DATA * lpFindFi
while((szFileName = ReadListFileLine(pCache, &nLength)) != NULL)
{
// Check search mask
- if(nLength != 0 && CheckWildCard(szFileName, pCache->szWildCard))
+ if(nLength != 0 && SFileCheckWildCard(szFileName, pCache->szWildCard))
{
if(nLength >= sizeof(lpFindFileData->cFileName))
nLength = sizeof(lpFindFileData->cFileName) - 1;