From 17308e821f262c3bdfba1cdc1887be68fba0ea79 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 25 May 2024 12:04:51 +0100 Subject: [PATCH] Formatting. --- common/string_utils.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/string_utils.cpp b/common/string_utils.cpp index f3a794c4ba..f10e9d5c8d 100644 --- a/common/string_utils.cpp +++ b/common/string_utils.cpp @@ -826,8 +826,10 @@ int StrNumCmp( const wxString& aString1, const wxString& aString2, bool aIgnoreC bool WildCompareString( const wxString& pattern, const wxString& string_to_tst, bool case_sensitive ) { - const wxChar* cp = nullptr, * mp = nullptr; - const wxChar* wild, * str; + const wxChar* cp = nullptr; + const wxChar* mp = nullptr; + const wxChar* wild = nullptr; + const wxChar* str = nullptr; wxString _pattern, _string_to_tst; if( case_sensitive ) @@ -841,7 +843,7 @@ bool WildCompareString( const wxString& pattern, const wxString& string_to_tst, _pattern.MakeUpper(); _string_to_tst = string_to_tst; _string_to_tst.MakeUpper(); - wild = _pattern.GetData(); + wild = _pattern.GetData(); str = _string_to_tst.GetData(); } @@ -859,7 +861,8 @@ bool WildCompareString( const wxString& pattern, const wxString& string_to_tst, if( *wild == '*' ) { if( !*++wild ) - return 1; + return true; + mp = wild; cp = str + 1; }