diff --git a/LZMA/LzmaCompress.c b/LZMA/LzmaCompress.c index 2bd1f19..622ca86 100644 --- a/LZMA/LzmaCompress.c +++ b/LZMA/LzmaCompress.c @@ -19,12 +19,13 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define LZMA_HEADER_SIZE (LZMA_PROPS_SIZE + 8) -static void * AllocForLzma(void *p, size_t size) { return malloc(size); } -static void FreeForLzma(void *p, void *address) { free(address); } +static void * AllocForLzma(void *p, size_t size) { (void)p; return malloc(size); } +static void FreeForLzma(void *p, void *address) { (void)p; free(address); } static ISzAlloc SzAllocForLzma = { &AllocForLzma, &FreeForLzma }; SRes OnProgress(void *p, UInt64 inSize, UInt64 outSize) { + (void)p; (void) inSize; (void) outSize; return SZ_OK; } @@ -105,4 +106,4 @@ UINT32 *DestinationSize else { return ERR_INVALID_PARAMETER; } -} \ No newline at end of file +} diff --git a/LZMA/LzmaDecompress.c b/LZMA/LzmaDecompress.c index b7ee39f..61a712f 100644 --- a/LZMA/LzmaDecompress.c +++ b/LZMA/LzmaDecompress.c @@ -27,8 +27,8 @@ UINT32 Count return Operand << Count; } -static void * AllocForLzma(void *p, size_t size) { return malloc(size); } -static void FreeForLzma(void *p, void *address) { free(address); } +static void * AllocForLzma(void *p, size_t size) { (void)p; return malloc(size); } +static void FreeForLzma(void *p, void *address) { (void)p; free(address); } static ISzAlloc SzAllocForLzma = { &AllocForLzma, &FreeForLzma }; /* @@ -156,4 +156,4 @@ VOID *Destination else { return ERR_INVALID_PARAMETER; } -} \ No newline at end of file +} diff --git a/LZMA/SDK/C/LzmaEnc.c b/LZMA/SDK/C/LzmaEnc.c index 37a7ae9..11fdfe0 100644 --- a/LZMA/SDK/C/LzmaEnc.c +++ b/LZMA/SDK/C/LzmaEnc.c @@ -1877,12 +1877,14 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) { UInt32 beforeSize = kNumOpts; - Bool btMode; if (!RangeEnc_Alloc(&p->rc, alloc)) return SZ_ERROR_MEM; - btMode = (p->matchFinderBase.btMode != 0); + #ifndef _7ZIP_ST - p->mtMode = (p->multiThread && !p->fastMode && btMode); + { + Bool btMode = (p->matchFinderBase.btMode != 0); + p->mtMode = (p->multiThread && !p->fastMode && btMode); + } #endif { @@ -2057,7 +2059,7 @@ void LzmaEnc_Finish(CLzmaEncHandle pp) if (p->mtMode) MatchFinderMt_ReleaseStream(&p->matchFinderMt); #else - //pp = pp; + (void)pp; #endif } @@ -2243,4 +2245,4 @@ SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, LzmaEnc_Destroy(p, alloc, allocBig); return res; -} \ No newline at end of file +} diff --git a/ffsengine.cpp b/ffsengine.cpp index 148d7d1..6ffef0b 100644 --- a/ffsengine.cpp +++ b/ffsengine.cpp @@ -365,7 +365,7 @@ UINT8 FfsEngine::parseIntelImage(const QByteArray & intelImage, QModelIndex & in biosEnd = calculateRegionSize(regionSection->BiosBase, regionSection->BiosLimit); // Check for Gigabyte specific descriptor map - if (biosEnd - biosBegin == intelImage.size()) { + if (biosEnd - biosBegin == (UINT32)intelImage.size()) { if (!meEnd) { msg(tr("parseIntelImage: can determine BIOS region start from Gigabyte-specific descriptor")); return ERR_INVALID_FLASH_DESCRIPTOR; @@ -1262,7 +1262,7 @@ UINT8 FfsEngine::parseDepexSection(const QByteArray & body, QString & parsed) return ERR_DEPEX_PARSE_FAILED; case EFI_DEP_PUSH: // Check that the rest of depex has correct size - if (body.size() - (current - (UINT8*)body.data()) <= EFI_DEP_OPCODE_SIZE + sizeof(EFI_GUID)) { + if ((UINT32)body.size() - (UINT32)(current - (UINT8*)body.data()) <= EFI_DEP_OPCODE_SIZE + sizeof(EFI_GUID)) { parsed.clear(); return ERR_DEPEX_PARSE_FAILED; } diff --git a/uefitool.cpp b/uefitool.cpp index a3b8f59..38a0962 100644 --- a/uefitool.cpp +++ b/uefitool.cpp @@ -17,7 +17,7 @@ UEFITool::UEFITool(QWidget *parent) : QMainWindow(parent), ui(new Ui::UEFITool), -version(tr("0.18.9.2")) +version(tr("0.18.10")) { clipboard = QApplication::clipboard();