ZipArchive: Update to the 4.6.9 release

1 files changed, 17 insertions, 13 deletions

diff --git a/zip/ZipArchive/Wildcard.h b/zip/ZipArchive/Wildcard.h
index a9924fa..1811b65 100644
--- a/zip/ZipArchive/Wildcard.h
+++ b/zip/ZipArchive/Wildcard.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////

-// This source file is part of the ZipArchive library source distribution and

-// is Copyrighted 2000 - 2007 by Artpol Software - Tadeusz Dracz

+// This source file is part of the ZipArchive Library Open Source distribution 

+// and is Copyrighted 2000 - 2022 by Artpol Software - Tadeusz Dracz

 //

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

@@ -9,7 +9,7 @@
 // 

 // For the licensing details refer to the License.txt file.

 //

-// Web Site: http://www.artpol-software.com

+// Web Site: https://www.artpol-software.com

 ////////////////////////////////////////////////////////////////////////////////

 

 /*

@@ -51,12 +51,12 @@ namespace ZipArchiveLib
 		enum Match

 		{

 			matchNone,			///< For internal use.

-			matchValid,			///< Valid match.

+			matchValid,			///< A valid match.

 			matchEnd,			///< Premature end of the pattern string.

 			matchAbort,			///< Premature end of the text string.

 			matchRange,			///< Match failure on the \c [..] construct.

 			matchLiteral,		///< Match failure on a literal match

-			matchPattern		///< Bad pattern.

+			matchPattern		///< A bad pattern.

 		};

 		

 		enum Pattern 

@@ -64,21 +64,21 @@ namespace ZipArchiveLib
 			patternEmpty = -4,	///< The \c [..] construct is empty

 			patternClose,		///< There is no end bracket in the \c [..] construct.

 			patternRange,		///< Malformed range in the \c [..] construct.

-			patternEsc,			///< Literal escape at the end of the pattern.

-			patternValid,		///< Valid pattern.

+			patternEsc,			///< There is a literal escape at the end of the pattern.

+			patternValid,		///< A valid pattern.

 		};

 		

 		

 		/**

 			Matches \a lpszText against the pattern.

-			A match means the entire \a lpszText is used up in matching.

+			A match means the entire \a lpszText is used in matching.

 			Set the pattern with the #SetPattern method or in the constructor.

 			

 			\param lpszText

 				The string to match against the pattern.

 

 			\param iRetCode

-				If not \c NULL, receives one of #Match values indicating a return code.

+				If not \c NULL, receives one of the #Match values indicating a return code.

 

 			\return

 				\c true, if \a lpszText matches the pattern.

@@ -89,7 +89,7 @@ namespace ZipArchiveLib
 		bool IsMatch(LPCTSTR lpszText, int* iRetCode = NULL);

 

 		/**

-			Gets a value indicating if \a lpszPattern has any special wildcard characters.

+			Returns the value indicating whether \a lpszPattern has any special wildcard characters.

 

 			\param lpszPattern

 				The pattern to test.

@@ -127,7 +127,7 @@ namespace ZipArchiveLib
 				The string to match against the pattern.

 

 			\return 

-				One of #Match values.

+				One of the #Match values.

 

 			\see

 				SetPattern

@@ -137,7 +137,10 @@ namespace ZipArchiveLib
 		/**	

 			Initializes a new instance of the CWildcard class.

 		*/

-		CWildcard(){}

+		CWildcard()

+		{

+			m_bCaseSensitive = false;

+		}

 

 		/**

 			Initializes a new instance of the CWildcard class.

@@ -151,6 +154,7 @@ namespace ZipArchiveLib
 			\see

 				<a href="kb">0610242025|wildcards</a>

 		*/

+#pragma warning(suppress: 26495)

 		CWildcard(LPCTSTR lpszPattern, bool bCaseSensitive)

 		{

 			SetPattern(lpszPattern, bCaseSensitive);

@@ -173,7 +177,7 @@ namespace ZipArchiveLib
 		void SetPattern(LPCTSTR lpszPattern, bool bCaseSensitive)

 		{

 			m_szPattern = lpszPattern;

-			m_bCaseSensitive=bCaseSensitive;

+			m_bCaseSensitive = bCaseSensitive;

 			if (!bCaseSensitive)

 				m_szPattern.MakeLower();

 		}