Avoid some warnings with Griffin

This commit is contained in:
twinaphex 2017-09-21 19:43:01 +02:00
parent ece3dddfce
commit 01b2d09a98
3 changed files with 8 additions and 7 deletions

4
deps/7zip/7zTypes.h vendored
View File

@ -19,6 +19,10 @@
EXTERN_C_BEGIN
#ifndef _7ZIP_ST
#define _7ZIP_ST
#endif
#define SZ_OK 0
#define SZ_ERROR_DATA 1

4
deps/7zip/LzFind.c vendored
View File

@ -12,7 +12,7 @@
#define kMaxValForNormalize ((uint32_t)0xFFFFFFFF)
#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
#define kNormalizeMask (~(uint32_t)(kNormalizeStepMin - 1))
#define kMaxHistorySize ((uint32_t)7 << 29)
#define LzFindkMaxHistorySize ((uint32_t)7 << 29)
#define kStartMaxLen 3
@ -180,7 +180,7 @@ int MatchFinder_Create(CMatchFinder *p, uint32_t historySize,
{
uint32_t sizeReserv;
if (historySize > kMaxHistorySize)
if (historySize > LzFindkMaxHistorySize)
{
MatchFinder_Free(p, alloc);
return 0;

7
deps/7zip/LzmaEnc.c vendored
View File

@ -9,14 +9,11 @@
#include "LzFind.h"
#define _7ZIP_ST
#ifndef _7ZIP_ST
#include "LzFindMt.h"
#endif
#define kMaxHistorySize ((uint32_t)3 << 29)
/* #define kMaxHistorySize ((uint32_t)7 << 29) */
#define LzmaEnckMaxHistorySize ((uint32_t)3 << 29)
#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
@ -392,7 +389,7 @@ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
|| props.lp > LZMA_LP_MAX
|| props.pb > LZMA_PB_MAX
|| props.dictSize > ((uint64_t)1 << kDicLogSizeMaxCompress)
|| props.dictSize > kMaxHistorySize)
|| props.dictSize > LzmaEnckMaxHistorySize)
return SZ_ERROR_PARAM;
p->dictSize = props.dictSize;