diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-06-02 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:15:59 +0300 |
commit | 829409452d85cd6dd9dfc9151f109d6e13a2bb1c (patch) | |
tree | e0acaea47044d167f35fa197584dee1bde41c329 /CPP/7zip/Archive/Cab | |
parent | 8874e4fbc9faabdcff719b9b2ac8ebad4f282bbe (diff) |
9.04 beta
Diffstat (limited to 'CPP/7zip/Archive/Cab')
-rwxr-xr-x | CPP/7zip/Archive/Cab/CabBlockInStream.cpp | 3 | ||||
-rwxr-xr-x | CPP/7zip/Archive/Cab/CabIn.cpp | 6 | ||||
-rwxr-xr-x | CPP/7zip/Archive/Cab/CabIn.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/CPP/7zip/Archive/Cab/CabBlockInStream.cpp b/CPP/7zip/Archive/Cab/CabBlockInStream.cpp index 308616b8..12c73eb5 100755 --- a/CPP/7zip/Archive/Cab/CabBlockInStream.cpp +++ b/CPP/7zip/Archive/Cab/CabBlockInStream.cpp @@ -2,10 +2,7 @@ #include "StdAfx.h" -extern "C" -{ #include "../../../../C/Alloc.h" -} #include "Common/Defs.h" diff --git a/CPP/7zip/Archive/Cab/CabIn.cpp b/CPP/7zip/Archive/Cab/CabIn.cpp index 2b0a426b..afc0faed 100755 --- a/CPP/7zip/Archive/Cab/CabIn.cpp +++ b/CPP/7zip/Archive/Cab/CabIn.cpp @@ -57,7 +57,7 @@ void CInArchive::ReadOtherArchive(COtherArchive &oa) oa.DiskName = SafeReadName(); } -void CInArchive::Skeep(size_t size) +void CInArchive::Skip(size_t size) { while (size-- != 0) ReadByte(); @@ -104,7 +104,7 @@ HRESULT CInArchive::Open2(IInStream *stream, ai.PerFolderAreaSize = ReadByte(); ai.PerDataBlockAreaSize = ReadByte(); - Skeep(ai.PerCabinetAreaSize); + Skip(ai.PerCabinetAreaSize); } { @@ -124,7 +124,7 @@ HRESULT CInArchive::Open2(IInStream *stream, folder.CompressionTypeMajor = ReadByte(); folder.CompressionTypeMinor = ReadByte(); - Skeep(ai.PerFolderAreaSize); + Skip(ai.PerFolderAreaSize); database.Folders.Add(folder); } diff --git a/CPP/7zip/Archive/Cab/CabIn.h b/CPP/7zip/Archive/Cab/CabIn.h index 197017b9..c9cfcbdd 100755 --- a/CPP/7zip/Archive/Cab/CabIn.h +++ b/CPP/7zip/Archive/Cab/CabIn.h @@ -149,7 +149,7 @@ class CInArchive UInt16 ReadUInt16(); UInt32 ReadUInt32(); AString SafeReadName(); - void Skeep(size_t size); + void Skip(size_t size); void ReadOtherArchive(COtherArchive &oa); HRESULT Open2(IInStream *inStream, |