diff options
Diffstat (limited to 'CPP/7zip/Archive/Cab/CabItem.h')
| -rwxr-xr-x | CPP/7zip/Archive/Cab/CabItem.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/CPP/7zip/Archive/Cab/CabItem.h b/CPP/7zip/Archive/Cab/CabItem.h index 8b41fe69..63a1e856 100755 --- a/CPP/7zip/Archive/Cab/CabItem.h +++ b/CPP/7zip/Archive/Cab/CabItem.h @@ -19,9 +19,8 @@ struct CFolder Byte GetCompressionMethod() const { return (Byte)(CompressionTypeMajor & 0xF); } }; -class CItem +struct CItem { -public: AString Name; UInt32 Offset; UInt32 Size; @@ -29,26 +28,28 @@ public: UInt16 FolderIndex; UInt16 Flags; UInt16 Attributes; + UInt64 GetEndOffset() const { return (UInt64)Offset + Size; } UInt32 GetWinAttributes() const { return (Attributes & ~NHeader::kFileNameIsUTFAttributeMask); } bool IsNameUTF() const { return (Attributes & NHeader::kFileNameIsUTFAttributeMask) != 0; } - bool IsDirectory() const { return (Attributes & FILE_ATTRIBUTE_DIRECTORY) != 0; } + bool IsDir() const { return (Attributes & FILE_ATTRIBUTE_DIRECTORY) != 0; } - bool ContinuedFromPrev() const - { - return + bool ContinuedFromPrev() const + { + return (FolderIndex == NHeader::NFolderIndex::kContinuedFromPrev) || (FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext); } - bool ContinuedToNext() const - { - return + + bool ContinuedToNext() const + { + return (FolderIndex == NHeader::NFolderIndex::kContinuedToNext) || (FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext); } - int GetFolderIndex(int numFolders) const - { + int GetFolderIndex(int numFolders) const + { if (ContinuedFromPrev()) return 0; if (ContinuedToNext()) |