17.00

CPP/7zip/Archive/7z/7zItem.h

@@ -26,12 +26,14 @@ struct CCoderInfo
   bool IsSimpleCoder() const { return NumStreams == 1; }
 };
 
+
 struct CBond
 {
   UInt32 PackIndex;
   UInt32 UnpackIndex;
 };
 
+
 struct CFolder
 {
   CLASS_NO_COPY(CFolder)
@@ -87,6 +89,7 @@ public:
   }
 };
 
+
 struct CUInt32DefVector
 {
   CBoolVector Defs;
@@ -110,9 +113,25 @@ struct CUInt32DefVector
     Vals.ReserveDown();
   }
 
+  bool GetItem(unsigned index, UInt32 &value) const
+  {
+    if (index < Defs.Size() && Defs[index])
+    {
+      value = Vals[index];
+      return true;
+    }
+    value = 0;
+    return false;
+  }
+
   bool ValidAndDefined(unsigned i) const { return i < Defs.Size() && Defs[i]; }
+
+  bool CheckSize(unsigned size) const { return Defs.Size() == size || Defs.Size() == 0; }
+
+  void SetItem(unsigned index, bool defined, UInt32 value);
 };
 
+
 struct CUInt64DefVector
 {
   CBoolVector Defs;
@@ -141,15 +160,15 @@ struct CUInt64DefVector
     return false;
   }
   
-  void SetItem(unsigned index, bool defined, UInt64 value);
-
   bool CheckSize(unsigned size) const { return Defs.Size() == size || Defs.Size() == 0; }
+
+  void SetItem(unsigned index, bool defined, UInt64 value);
 };
 
+
 struct CFileItem
 {
   UInt64 Size;
-  UInt32 Attrib;
   UInt32 Crc;
   /*
   int Parent;
@@ -159,23 +178,23 @@ struct CFileItem
                   // stream in some folder. It can be empty stream
   bool IsDir;
   bool CrcDefined;
-  bool AttribDefined;
+
+  /*
+  void Clear()
+  {
+    HasStream = true;
+    IsDir = false;
+    CrcDefined = false;
+  }
 
   CFileItem():
-    /*
-    Parent(-1),
-    IsAltStream(false),
-    */
+    // Parent(-1),
+    // IsAltStream(false),
     HasStream(true),
     IsDir(false),
     CrcDefined(false),
-    AttribDefined(false)
       {}
-  void SetAttrib(UInt32 attrib)
-  {
-    AttribDefined = true;
-    Attrib = attrib;
-  }
+  */
 };
 
 }}