diff options
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/UI/Common')
7 files changed, 13 insertions, 9 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp index 8ae2e15e8..3750f5b24 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveCommandLine.cpp @@ -275,6 +275,8 @@ static void AddNameToCensor(NWildcard::CCensor &wildcardCensor, case NRecursedType::kRecursed: recursed = true; break; + default: // PQR for MinGW-w64: To avoid compiler warnings on unhandled cases. + break; } wildcardCensor.AddItem(include, name, recursed); } @@ -742,8 +744,8 @@ static int FindCharset(const NCommandLineParser::CParser &parser, int keyIndex, UString name = parser[keyIndex].PostStrings.Back(); name.MakeUpper(); - int i; - for (i = 0; i < sizeof(g_CodePagePairs) / sizeof(g_CodePagePairs[0]); i++) + unsigned int i; + for (i = 0; i < sizeof(g_CodePagePairs) / sizeof(g_CodePagePairs[0]); i++) // PQR for MinGW-w64: Signed < Unsigned. { const CCodePagePair &pair = g_CodePagePairs[i]; if (name.Compare(pair.Name) == 0) diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp index 4c0cc90b5..54ad11945 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp @@ -316,6 +316,8 @@ STDMETHODIMP CArchiveExtractCallback::GetStream(UInt32 index, ISequentialOutStre return E_FAIL; } } + default: // PQR for MinGW-w64: To avoid compiler warnings about unhandled cases. + break; } if (_overwriteMode == NExtract::NOverwriteMode::kAutoRename) { diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/Bench.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/Bench.cpp index 282f405f1..163851c3a 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/Bench.cpp +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/Bench.cpp @@ -907,7 +907,7 @@ struct CCrcThreads { UInt32 NumThreads; CCrcInfo *Items; - CCrcThreads(): Items(0), NumThreads(0) {} + CCrcThreads(): NumThreads(0), Items(0) {} // PQR for MinGW-w64: Initialization order. void WaitAll() { for (UInt32 i = 0; i < NumThreads; i++) diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/EnumDirItems.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/EnumDirItems.cpp index ba03ea35c..71073f2b7 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/EnumDirItems.cpp +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/EnumDirItems.cpp @@ -219,7 +219,7 @@ static HRESULT EnumerateDirItems(const NWildcard::CCensorNode &curNode, continue; } bool isDir = fi.IsDir(); - if (isDir && !item.ForDir || !isDir && !item.ForFile) + if ((isDir && !item.ForDir) || (!isDir && !item.ForFile)) // PQR for MinGW-w64: Priority parentheses. { errorCodes.Add((DWORD)E_FAIL); errorPaths.Add(fullPath); diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/ExtractingFilePath.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/ExtractingFilePath.cpp index 8f31708b6..91749497f 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/ExtractingFilePath.cpp +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/ExtractingFilePath.cpp @@ -59,7 +59,7 @@ static bool CheckNameNum(const UString &name, const wchar_t *reservedName) static bool IsSupportedName(const UString &name) { - for (int i = 0; i < sizeof(g_ReservedNames) / sizeof(g_ReservedNames[0]); i++) + for (unsigned int i = 0; i < sizeof(g_ReservedNames) / sizeof(g_ReservedNames[0]); i++) // PQR for MinGW-w64: Signed < Unsigned comparison. { const wchar_t *reservedName = g_ReservedNames[i]; int len = MyStringLen(reservedName); diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/OpenArchive.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/OpenArchive.cpp index 56a630467..ab45bd027 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/OpenArchive.cpp +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/OpenArchive.cpp @@ -167,7 +167,7 @@ HRESULT CArc::OpenStream( { const CArcInfoEx &ai = codecs->Formats[orderIndices[i]]; const CByteBuffer &sig = ai.StartSignature; - if (sig.GetCapacity() < kNumHashBytes) + if (sig.GetCapacity() < (unsigned int)kNumHashBytes) // PQR for MinGW-w64: Signed < Unsigned comparison. continue; UInt32 v = HASH_VAL(sig, 0); prevs[i] = hash[v]; diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/Update.h b/src/libs/7zip/win/CPP/7zip/UI/Common/Update.h index 49af0092a..15cc5010c 100644 --- a/src/libs/7zip/win/CPP/7zip/UI/Common/Update.h +++ b/src/libs/7zip/win/CPP/7zip/UI/Common/Update.h @@ -116,12 +116,12 @@ struct CUpdateOptions CUpdateOptions(): UpdateArchiveItself(true), SfxMode(false), + OpenShareForWrite(false), StdInMode(false), StdOutMode(false), EMailMode(false), - EMailRemoveAfter(false), - OpenShareForWrite(false) - {}; + EMailRemoveAfter(false) + {} // PQR for MinGW-w64: Initialization order. void SetAddActionCommand() { |