|
|
@ -219,26 +219,26 @@ |
|
|
|
{
|
|
|
|
{
|
|
|
|
UInt32 dicSize;
|
|
|
|
UInt32 dicSize;
|
|
|
|
Byte d;
|
|
|
|
Byte d;
|
|
|
|
@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
|
|
|
|
@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma
|
|
|
|
return SZ_OK;
|
|
|
|
return SZ_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
|
|
|
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
|
|
|
+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
CLzmaProps propNew;
|
|
|
|
|
|
|
|
RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
|
|
|
|
|
|
|
@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
|
|
|
|
|
|
|
|
p->prop = propNew;
|
|
|
|
|
|
|
|
return SZ_OK;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
|
-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
|
|
|
|
|
|
|
-{
|
|
|
|
-{
|
|
|
|
- CLzmaProps propNew;
|
|
|
|
- CLzmaProps propNew;
|
|
|
|
- SizeT dicBufSize;
|
|
|
|
|
|
|
|
- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
|
|
|
- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
|
|
|
- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
|
|
|
|
- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
|
|
|
|
|
|
|
|
- p->prop = propNew;
|
|
|
|
|
|
|
|
- return SZ_OK;
|
|
|
|
|
|
|
|
-}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
|
-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
|
|
|
|
|
|
|
+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
CLzmaProps propNew;
|
|
|
|
|
|
|
|
- SizeT dicBufSize;
|
|
|
|
|
|
|
|
RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
|
|
|
|
|
|
|
RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
|
|
|
|
- dicBufSize = propNew.dicSize;
|
|
|
|
- dicBufSize = propNew.dicSize;
|
|
|
|
- if (p->dic == 0 || dicBufSize != p->dicBufSize)
|
|
|
|
- if (p->dic == 0 || dicBufSize != p->dicBufSize)
|
|
|
|
- {
|
|
|
|
- {
|
|
|
@ -251,12 +251,9 @@ |
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- p->dicBufSize = dicBufSize;
|
|
|
|
- p->dicBufSize = dicBufSize;
|
|
|
|
- p->prop = propNew;
|
|
|
|
p->prop = propNew;
|
|
|
|
- return SZ_OK;
|
|
|
|
return SZ_OK;
|
|
|
|
-}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
|
|
|
|
|
|
|
|
const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
|
|
|
|
|
|
|
|
--- a/include/linux/lzma/LzmaEnc.h
|
|
|
|
--- a/include/linux/lzma/LzmaEnc.h
|
|
|
|
+++ b/include/linux/lzma/LzmaEnc.h
|
|
|
|
+++ b/include/linux/lzma/LzmaEnc.h
|
|
|
|
@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
|
|
|
|
@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
|
|
|
|