diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-22 11:59:15 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-22 11:59:15 +0300 |
commit | 87dcee0c0c33ab2f2a8d22e0d0b53f0289ef7a46 (patch) | |
tree | 9a1558bcb4e624fd1706be9dc460bd5fb0ba50b6 /extern/lzma | |
parent | d2cb0f955b25857cb4f3fd28ebc4567f997d56b2 (diff) |
Silence some annoying warnings when doing full build with strict flags
This mainly touches extern libraries and few debug-only places in intern.
Some summary:
- External libraries are not strict at all about missing declarations,
so we can rather safely remove such warning together with other strict
flags.
- Bullet has some static functions which are not used.
Those were commented out.
- Carve now has some unused debug-only functions commented out as well.
While we're on the way of getting rid of Carve, it makes sense to make
things a bit cleaner for the time being.
- In LZMA we have some parts disabled which gives some set but unused
variables which is rather correct.
- Elbeem had quite some variables set and never used because their usage
is inside of debug-only code which is commented out.
Note about patching upstream libraries: surely one might say that we
have to make local patchset against this, but own experience says it
only gives extra work trying to merge such tweaks to a new upstream
version and usually it's just faster to re-apply such fixes again after
bundling new upstream library.
Diffstat (limited to 'extern/lzma')
-rw-r--r-- | extern/lzma/LzmaEnc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extern/lzma/LzmaEnc.c b/extern/lzma/LzmaEnc.c index 9196c43f64b..8c5636fc89e 100644 --- a/extern/lzma/LzmaEnc.c +++ b/extern/lzma/LzmaEnc.c @@ -1919,11 +1919,10 @@ 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); #ifdef COMPRESS_MF_MT + Bool btMode = (p->matchFinderBase.btMode != 0);; p->mtMode = (p->multiThread && !p->fastMode && btMode); #endif |