15.05

C/XzDec.c

@@ -1,5 +1,5 @@
 /* XzDec.c -- Xz Decode
-2014-12-30 : Igor Pavlov : Public domain */
+2015-05-01 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -32,9 +32,9 @@
 
 unsigned Xz_ReadVarInt(const Byte *p, size_t maxSize, UInt64 *value)
 {
-  int i, limit;
+  unsigned i, limit;
   *value = 0;
-  limit = (maxSize > 9) ? 9 : (int)maxSize;
+  limit = (maxSize > 9) ? 9 : (unsigned)maxSize;
 
   for (i = 0; i < limit;)
   {
@@ -66,12 +66,12 @@ typedef struct
   Byte buf[BRA_BUF_SIZE];
 } CBraState;
 
-void BraState_Free(void *pp, ISzAlloc *alloc)
+static void BraState_Free(void *pp, ISzAlloc *alloc)
 {
   alloc->Free(alloc, pp);
 }
 
-SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *alloc)
+static SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *alloc)
 {
   CBraState *p = ((CBraState *)pp);
   alloc = alloc;
@@ -87,7 +87,7 @@ SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *a
     if (propSize == 4)
     {
       UInt32 v = GetUi32(props);
-      switch(p->methodId)
+      switch (p->methodId)
       {
         case XZ_ID_PPC:
         case XZ_ID_ARM:
@@ -112,7 +112,7 @@ SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *a
   return SZ_OK;
 }
 
-void BraState_Init(void *pp)
+static void BraState_Init(void *pp)
 {
   CBraState *p = ((CBraState *)pp);
   p->bufPos = p->bufConv = p->bufTotal = 0;
@@ -163,7 +163,7 @@ static SRes BraState_Code(void *pp, Byte *dest, SizeT *destLen, const Byte *src,
     }
     if (p->bufTotal == 0)
       break;
-    switch(p->methodId)
+    switch (p->methodId)
     {
       case XZ_ID_Delta:
         if (p->encodeMode)
@@ -235,7 +235,7 @@ static void SbState_Free(void *pp, ISzAlloc *alloc)
 
 static SRes SbState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *alloc)
 {
-  pp = pp;
+  UNUSED_VAR(pp);
   props = props;
   alloc = alloc;
   return (propSize == 0) ? SZ_OK : SZ_ERROR_UNSUPPORTED;
@@ -330,9 +330,9 @@ static SRes Lzma2State_SetFromMethod(IStateCoder *p, ISzAlloc *alloc)
 
 void MixCoder_Construct(CMixCoder *p, ISzAlloc *alloc)
 {
-  int i;
+  unsigned i;
   p->alloc = alloc;
-  p->buf = 0;
+  p->buf = NULL;
   p->numCoders = 0;
   for (i = 0; i < MIXCODER_NUM_FILTERS_MAX; i++)
     p->coders[i].p = NULL;
@@ -340,7 +340,7 @@ void MixCoder_Construct(CMixCoder *p, ISzAlloc *alloc)
 
 void MixCoder_Free(CMixCoder *p)
 {
-  int i;
+  unsigned i;
   for (i = 0; i < p->numCoders; i++)
   {
     IStateCoder *sc = &p->coders[i];
@@ -351,14 +351,14 @@ void MixCoder_Free(CMixCoder *p)
   if (p->buf)
   {
     p->alloc->Free(p->alloc, p->buf);
-    p->buf = 0; /* 9.31: the BUG was fixed */
+    p->buf = NULL; /* 9.31: the BUG was fixed */
   }
 }
 
 void MixCoder_Init(CMixCoder *p)
 {
-  int i;
-  for (i = 0; i < p->numCoders - 1; i++)
+  unsigned i;
+  for (i = 0; i < MIXCODER_NUM_FILTERS_MAX - 1; i++)
   {
     p->size[i] = 0;
     p->pos[i] = 0;
@@ -371,11 +371,11 @@ void MixCoder_Init(CMixCoder *p)
   }
 }
 
-SRes MixCoder_SetFromMethod(CMixCoder *p, int coderIndex, UInt64 methodId)
+SRes MixCoder_SetFromMethod(CMixCoder *p, unsigned coderIndex, UInt64 methodId)
 {
   IStateCoder *sc = &p->coders[coderIndex];
   p->ids[coderIndex] = methodId;
-  switch(methodId)
+  switch (methodId)
   {
     case XZ_ID_LZMA2: return Lzma2State_SetFromMethod(sc, p->alloc);
     #ifdef USE_SUBBLOCK
@@ -398,10 +398,10 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen,
   *srcLen = 0;
   *status = CODER_STATUS_NOT_FINISHED;
 
-  if (p->buf == 0)
+  if (!p->buf)
   {
     p->buf = (Byte *)p->alloc->Alloc(p->alloc, CODER_BUF_SIZE * (MIXCODER_NUM_FILTERS_MAX - 1));
-    if (p->buf == 0)
+    if (!p->buf)
       return SZ_ERROR_MEM;
   }
 
@@ -411,7 +411,7 @@ SRes MixCoder_Code(CMixCoder *p, Byte *dest, SizeT *destLen,
   for (;;)
   {
     Bool processed = False;
-    int i;
+    unsigned i;
     /*
     if (p->numCoders == 1 && *destLen == destLenOrig && finishMode == LZMA_FINISH_ANY)
       break;
@@ -520,8 +520,8 @@ static Bool Xz_CheckFooter(CXzStreamFlags flags, UInt64 indexSize, const Byte *b
 SRes XzBlock_Parse(CXzBlock *p, const Byte *header)
 {
   unsigned pos;
-  int numFilters, i;
-  UInt32 headerSize = (UInt32)header[0] << 2;
+  unsigned numFilters, i;
+  unsigned headerSize = (unsigned)header[0] << 2;
 
   if (CrcCalc(header, headerSize) != GetUi32(header + headerSize))
     return SZ_ERROR_ARCHIVE;
@@ -557,7 +557,7 @@ SRes XzBlock_Parse(CXzBlock *p, const Byte *header)
     #ifdef XZ_DUMP
     printf("\nf[%d] = %2X: ", i, filter->id);
     {
-      int i;
+      unsigned i;
       for (i = 0; i < size; i++)
         printf(" %2X", filter->props[i]);
     }
@@ -572,9 +572,10 @@ SRes XzBlock_Parse(CXzBlock *p, const Byte *header)
 
 SRes XzDec_Init(CMixCoder *p, const CXzBlock *block)
 {
-  int i;
+  unsigned i;
   Bool needReInit = True;
-  int numFilters = XzBlock_GetNumFilters(block);
+  unsigned numFilters = XzBlock_GetNumFilters(block);
+  
   if (numFilters == p->numCoders)
   {
     for (i = 0; i < numFilters; i++)
@@ -582,6 +583,7 @@ SRes XzDec_Init(CMixCoder *p, const CXzBlock *block)
         break;
     needReInit = (i != numFilters);
   }
+  
   if (needReInit)
   {
     MixCoder_Free(p);
@@ -592,12 +594,14 @@ SRes XzDec_Init(CMixCoder *p, const CXzBlock *block)
       RINOK(MixCoder_SetFromMethod(p, i, f->id));
     }
   }
+  
   for (i = 0; i < numFilters; i++)
   {
     const CXzFilter *f = &block->filters[numFilters - 1 - i];
     IStateCoder *sc = &p->coders[i];
     RINOK(sc->SetProps(sc->p, f->props, f->propsSize, p->alloc));
   }
+  
   MixCoder_Init(p);
   return SZ_OK;
 }