diff options
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/Archive/7z')
4 files changed, 8 insertions, 9 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zCompressionMode.h b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zCompressionMode.h index b3536dd0c..55bbc68ee 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zCompressionMode.h +++ b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zCompressionMode.h @@ -38,12 +38,11 @@ struct CCompressionMethodMode UString Password; bool IsEmpty() const { return (Methods.IsEmpty() && !PasswordIsDefined); } - CCompressionMethodMode(): + CCompressionMethodMode(): PasswordIsDefined(false) #ifndef _7ZIP_ST - NumThreads(1), + , NumThreads(1) #endif - PasswordIsDefined(false) - {} // PQR for MinGW-w64: Initialization order. + {} }; }} diff --git a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zIn.cpp b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zIn.cpp index 245cad7fa..0feb81d2c 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zIn.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zIn.cpp @@ -297,7 +297,7 @@ static inline bool TestSignature2(const Byte *p) return false; if (CrcCalc(p + 12, 20) == GetUi32(p + 8)) return true; - for (i = 8; i < (int)kHeaderSize; i++) // PQR for MinGW-w64: Signed < Unsigned comparison. + for (i = 8; i < kHeaderSize; i++) if (p[i] != 0) return false; return (p[6] != 0 || p[7] != 0); @@ -1165,7 +1165,7 @@ HRESULT CInArchive::ReadDatabase2( Byte buf[kCheckSize]; RINOK(_stream->Seek(0, STREAM_SEEK_END, &cur2)); int checkSize = kCheckSize; - if (cur2 - cur < (unsigned int)kCheckSize) // PQR for MinGW-w64: Initialization order. + if (cur2 - cur < kCheckSize) checkSize = (int)(cur2 - cur); RINOK(_stream->Seek(-checkSize, STREAM_SEEK_END, &cur2)); @@ -1173,7 +1173,7 @@ HRESULT CInArchive::ReadDatabase2( int i; for (i = (int)checkSize - 2; i >= 0; i--) - if ((buf[i] == 0x17 && buf[i + 1] == 0x6) || (buf[i] == 0x01 && buf[i + 1] == 0x04)) // PQR for MinGW-w64: Priority parentheses. + if (buf[i] == 0x17 && buf[i + 1] == 0x6 || buf[i] == 0x01 && buf[i + 1] == 0x04) break; if (i < 0) return S_FALSE; diff --git a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zOut.cpp b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zOut.cpp index 82a14e0cd..0c8aa7e8c 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zOut.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zOut.cpp @@ -279,7 +279,7 @@ void COutArchive::WriteFolder(const CFolder &folder) size_t propsSize = coder.Props.GetCapacity(); UInt64 id = coder.MethodID; - unsigned int idSize; // PQR for MinGW-w64: Signed < Unsigned comparison. + int idSize; for (idSize = 1; idSize < sizeof(id); idSize++) if ((id >> (8 * idSize)) == 0) break; diff --git a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp index 3745d0bf4..ee7f55c04 100644 --- a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp +++ b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp @@ -333,7 +333,7 @@ static wchar_t *g_ExeExts[] = static bool IsExeExt(const UString &ext) { - for (unsigned int i = 0; i < sizeof(g_ExeExts) / sizeof(g_ExeExts[0]); i++) // PQR for MinGW-w64: Signed < Unsigned comparison. + for (int i = 0; i < sizeof(g_ExeExts) / sizeof(g_ExeExts[0]); i++) if (ext.CompareNoCase(g_ExeExts[i]) == 0) return true; return false; |