Rename limit variable to avoid shadowing warnings

This commit is contained in:
twinaphex 2014-10-22 07:35:14 +02:00
parent 565699da7c
commit a4cb7791f8

10
deps/7zip/LzmaDec.c vendored
View File

@ -289,7 +289,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, size_t limit, const uint
prob = probs + RepLenCoder; prob = probs + RepLenCoder;
} }
{ {
unsigned limit, offset; unsigned _limit, offset;
uint16_t *probLen = prob + LenChoice; uint16_t *probLen = prob + LenChoice;
ttt = *(probLen); ttt = *(probLen);
@ -300,7 +300,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, size_t limit, const uint
UPDATE_0(probLen); UPDATE_0(probLen);
probLen = prob + LenLow + (posState << kLenNumLowBits); probLen = prob + LenLow + (posState << kLenNumLowBits);
offset = 0; offset = 0;
limit = (1 << kLenNumLowBits); _limit = (1 << kLenNumLowBits);
} }
else else
{ {
@ -315,17 +315,17 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, size_t limit, const uint
UPDATE_0(probLen); UPDATE_0(probLen);
probLen = prob + LenMid + (posState << kLenNumMidBits); probLen = prob + LenMid + (posState << kLenNumMidBits);
offset = kLenNumLowSymbols; offset = kLenNumLowSymbols;
limit = (1 << kLenNumMidBits); _limit = (1 << kLenNumMidBits);
} }
else else
{ {
LZMADEC_UPDATE_1(probLen); LZMADEC_UPDATE_1(probLen);
probLen = prob + LenHigh; probLen = prob + LenHigh;
offset = kLenNumLowSymbols + kLenNumMidSymbols; offset = kLenNumLowSymbols + kLenNumMidSymbols;
limit = (1 << kLenNumHighBits); _limit = (1 << kLenNumHighBits);
} }
} }
TREE_DECODE(probLen, limit, len); TREE_DECODE(probLen, _limit, len);
len += offset; len += offset;
} }