summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/lib7z/7zIn.c
diff options
context:
space:
mode:
author Angelo Salese <angelosa@users.noreply.github.com>2012-02-19 15:23:23 +0000
committer Angelo Salese <angelosa@users.noreply.github.com>2012-02-19 15:23:23 +0000
commitcf4b58b6f630f0f7ef2d14be8f48de781de85170 (patch)
treefda19b40204c84e17d2c5965a7a1b7f15b6f85da /src/lib/lib7z/7zIn.c
parent2f8094ea333d06e32d2694a467a4b40e0aa835c1 (diff)
Clean-ups and version bumpmame0145u1
Diffstat (limited to 'src/lib/lib7z/7zIn.c')
-rw-r--r--src/lib/lib7z/7zIn.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/lib7z/7zIn.c b/src/lib/lib7z/7zIn.c
index ec93a43ffec..d7256dde718 100644
--- a/src/lib/lib7z/7zIn.c
+++ b/src/lib/lib7z/7zIn.c
@@ -537,12 +537,12 @@ static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
{
UInt32 numCoders, numBindPairs, numPackStreams, i;
UInt32 numInStreams = 0, numOutStreams = 0;
-
+
RINOK(SzReadNumber32(sd, &numCoders));
if (numCoders > NUM_FOLDER_CODERS_MAX)
return SZ_ERROR_UNSUPPORTED;
folder->NumCoders = numCoders;
-
+
MY_ALLOC(CSzCoderInfo, folder->Coders, (size_t)numCoders, alloc);
for (i = 0; i < numCoders; i++)
@@ -810,7 +810,7 @@ static SRes SzReadSubStreamsInfo(
numDigests += numSubstreams;
}
-
+
si = 0;
for (;;)
{
@@ -963,8 +963,8 @@ static SRes SzReadHeader2(
RINOK(SzReadArchiveProperties(sd));
RINOK(SzReadID(sd, &type));
}
-
-
+
+
if (type == k7zIdMainStreamsInfo)
{
RINOK(SzReadStreamsInfo(sd,
@@ -982,7 +982,7 @@ static SRes SzReadHeader2(
return SZ_OK;
if (type != k7zIdFilesInfo)
return SZ_ERROR_ARCHIVE;
-
+
RINOK(SzReadNumber32(sd, &numFiles));
p->db.NumFiles = numFiles;
@@ -1165,19 +1165,19 @@ static SRes SzReadAndDecodePackedStreams2(
RINOK(SzReadStreamsInfo(sd, &dataStartPos, p,
&numUnpackStreams, unpackSizes, digestsDefined, digests,
allocTemp, allocTemp));
-
+
dataStartPos += baseOffset;
if (p->NumFolders != 1)
return SZ_ERROR_ARCHIVE;
folder = p->Folders;
unpackSize = SzFolder_GetUnpackSize(folder);
-
+
RINOK(LookInStream_SeekTo(inStream, dataStartPos));
if (!Buf_Create(outBuffer, (size_t)unpackSize, allocTemp))
return SZ_ERROR_MEM;
-
+
res = SzFolder_Decode(folder, p->PackSizes,
inStream, dataStartPos,
outBuffer->data, (size_t)unpackSize, allocTemp);
@@ -1240,7 +1240,7 @@ static SRes SzArEx_Open2(
nextHeaderCRC = GetUi32(header + 28);
p->startPosAfterHeader = startArcPos + k7zStartHeaderSize;
-
+
if (CrcCalc(header + 12, 20) != GetUi32(header + 8))
return SZ_ERROR_CRC;
@@ -1356,9 +1356,9 @@ SRes SzArEx_Extract(
*blockIndex = folderIndex;
IAlloc_Free(allocMain, *outBuffer);
*outBuffer = 0;
-
+
RINOK(LookInStream_SeekTo(inStream, startOffset));
-
+
if (res == SZ_OK)
{
*outBufferSize = unpackSize;