Get rid of the m_newNamespaceScheme boolean.

Comparing the minorVersion "all the time" is enough.

Author: mgautierfr

src/fileheader.h

@@ -107,6 +107,9 @@ namespace zim
       bool        hasChecksum() const              { return getMimeListPos() >= 80; }
       offset_type getChecksumPos() const           { return hasChecksum() ? checksumPos : 0; }
       void        setChecksumPos(offset_type p)    { checksumPos = p; }
+
+      bool        useNewNamespaceScheme() const    { return minorVersion >= 1; }
+
   };
 
 }

src/fileimpl.cpp

@@ -186,7 +186,6 @@ class Grouping
       zimReader(makeFileReader(zimFile)),
       direntReader(new DirentReader(zimReader)),
       clusterCache(envValue("ZIM_CLUSTERCACHE", CLUSTER_CACHE_SIZE)),
-      m_newNamespaceScheme(false),
       m_hasFrontArticlesIndex(true),
       m_startUserEntry(0),
       m_endUserEntry(0)
@@ -366,8 +365,7 @@ class Grouping
       p = zp+1;
     }
 
-    const_cast<bool&>(m_newNamespaceScheme) = header.getMinorVersion() >= 1;
-    if (m_newNamespaceScheme) {
+    if (header.useNewNamespaceScheme()) {
       const_cast<entry_index_t&>(m_startUserEntry) = getNamespaceBeginOffset('C');
       const_cast<entry_index_t&>(m_endUserEntry) = getNamespaceEndOffset('C');
     } else {

src/fileimpl.h

@@ -56,7 +56,6 @@ namespace zim
       typedef std::shared_ptr<const Cluster> ClusterHandle;
       ConcurrentCache<cluster_index_type, ClusterHandle> clusterCache;
 
-      const bool m_newNamespaceScheme;
       const bool m_hasFrontArticlesIndex;
       const entry_index_t m_startUserEntry;
       const entry_index_t m_endUserEntry;
@@ -109,7 +108,7 @@ namespace zim
       const std::string& getFilename() const   { return zimFile->filename(); }
       const Fileheader& getFileheader() const  { return header; }
       zsize_t getFilesize() const;
-      bool hasNewNamespaceScheme() const { return m_newNamespaceScheme; }
+      bool hasNewNamespaceScheme() const { return header.useNewNamespaceScheme(); }
       bool hasFrontArticlesIndex() const { return m_hasFrontArticlesIndex; }
 
       FileCompound::PartRange getFileParts(offset_t offset, zsize_t size);