Address misc. linter reports

Author: flanglet

src/api/Compressor.cpp

@@ -258,11 +258,10 @@ KANZI_API int CDECL compress(struct cContext* pCtx, const unsigned char* src, si
 // Cleanup allocated internal data structures
 KANZI_API int CDECL disposeCompressor(struct cContext** ppCtx, size_t* outSize) KANZI_NOEXCEPT
 {
-    *outSize = 0;
-
-    if ((ppCtx == nullptr) || (*ppCtx == nullptr))
+    if ((ppCtx == nullptr) || (*ppCtx == nullptr) || (outSize == nullptr))
         return Error::ERR_INVALID_PARAM;
 
+    *outSize = 0;
     cContext* pCtx = *ppCtx;
     CompressedOutputStream* pCos = pCtx->pCos;
 

src/app/BlockDecompressor.cpp

@@ -387,7 +387,7 @@ int BlockDecompressor::decompress(uint64& inputSize)
         }
 
         ss << "Total output size: " << read << (read > 1 ? " bytes" : " byte") << endl;
-        log.print(ss.str(), _verbosity > 0);
+        log.print(ss.str(), true);
         ss.str(string());
     }
 

src/app/InfoPrinter.cpp

@@ -73,7 +73,7 @@ void InfoPrinter::processEvent(const Event& evt)
         }
     }
     else if (evt.getType() == _thresholds[2]) {
-        BlockInfo* bi = _map[hash(currentBlockId)];
+        const BlockInfo* bi = _map[hash(currentBlockId)];
 
         if (bi == nullptr)
             return;
@@ -244,10 +244,10 @@ void InfoPrinter::processHeaderInfo(const Event& evt)
        size_t idx = inputName.find_last_of(PATH_SEPARATOR);
 
        if (idx != string::npos)
-          inputName = inputName.substr(idx + 1);
+          inputName.erase(0, idx + 1);
 
        if (inputName.length() > 20)
-          inputName = inputName.substr(0, 18) + "..";
+          inputName.replace(18, string::npos, "..");
 
        ss << std::left << setw(20) << inputName << "|" << std::right; // inputName
    }
@@ -296,7 +296,7 @@ void InfoPrinter::processHeaderInfo(const Event& evt)
        string t = tokens[5];
 
        if (t.length() > 26)
-          t = t.substr(0, 24) + "..";
+          t = t.replace(24, string::npos, "..");
 
        ss << setw(26) << (t == "" ? "NONE" : t) << "|"; // transforms
    }

src/entropy/CMPredictor.cpp

@@ -45,5 +45,5 @@ CMPredictor::CMPredictor()
     }
 
     _pc1 = _counter1[_ctx];
-    _pc2 = &_counter2[_ctx | _runMask][8];
+    _pc2 = &_counter2[_ctx][8];
 }

src/entropy/FPAQDecoder.cpp

@@ -47,6 +47,7 @@ bool FPAQDecoder::reset()
     _high = TOP;
     _current = 0;
     _ctx = 1;
+    _index = 0;
 
     for (int i = 0; i < 4; i++) {
         for (int j = 0; j < 256; j++)
@@ -73,7 +74,7 @@ int FPAQDecoder::decode(byte block[], uint blkptr, uint count)
         if (szBytes >= 2 * count)
             return 0;
 
-        const size_t bufSize = max(szBytes + (szBytes >> 2), 8192u);
+        const size_t bufSize = max(szBytes + (szBytes >> 3), 8192u);
 
         if (_buf.size() < bufSize)
             _buf.resize(bufSize);

src/entropy/FPAQDecoder.hpp

@@ -44,7 +44,7 @@ namespace kanzi
        uint64 _current;
        InputBitStream& _bitstream;
        std::vector<byte> _buf;
-       int _index;
+       uint _index;
        uint16 _probs[4][256]; // probability of bit=1
        uint16* _p; // pointer to current prob
        int _ctx; // previous bits

src/entropy/FPAQEncoder.cpp

@@ -62,14 +62,14 @@ int FPAQEncoder::encode(const byte block[], uint blkptr, uint count)
 
     uint startChunk = blkptr;
     const uint end = blkptr + count;
+    const size_t bufSize = max(DEFAULT_CHUNK_SIZE + (DEFAULT_CHUNK_SIZE >> 3), 1024u);
+
+    if (_buf.size() < bufSize)
+        _buf.resize(bufSize);
 
     // Split block into chunks, encode chunk and write bit array to bitstream
     while (startChunk < end) {
         const uint chunkSize = min(DEFAULT_CHUNK_SIZE, end - startChunk);
-        const size_t bufSize = max(chunkSize + (chunkSize >> 3), 1024u);
-
-        if (_buf.size() < bufSize)
-            _buf.resize(bufSize);
 
         _index = 0;
         const uint endChunk = startChunk + chunkSize;

src/entropy/FPAQEncoder.hpp

@@ -44,7 +44,7 @@ namespace kanzi
        bool _disposed;
        OutputBitStream& _bitstream;
        std::vector<byte> _buf;
-       int _index;
+       uint _index;
        uint16 _probs[4][256]; // probability of bit=1
 
 

src/io/CompressedInputStream.cpp

@@ -646,14 +646,14 @@ void CompressedInputStream::readHeader()
         string inputName = _ctx.getString("inputName", "");
         ss << inputName << ",";
         ss << bsVersion << ",";
-        string ckSize = "0";
+        string ckBits = "0";
 
         if (_hasher32 != nullptr)
-            ckSize = "32";
+            ckBits = "32";
         else if (_hasher64 != nullptr)
-            ckSize = "64";
+            ckBits = "64";
 
-        ss << ckSize << ",";
+        ss << ckBits << ",";
         ss << _blockSize << ",";
         string w1 = EntropyDecoderFactory::getName(_entropyType);
         ss << ((w1 == "NONE") ? "" : w1) << ",";

src/transform/LZCodec.cpp

@@ -393,14 +393,14 @@ bool LZXCodec<T>::forward(SliceArray<byte>& input, SliceArray<byte>& output, int
 
         while (srcIdx + 4 < anchor) {
             srcIdx += 4;
-            const int32 h0 = hash(&src[srcIdx - 3]);
-            const int32 h1 = hash(&src[srcIdx - 2]);
-            const int32 h2 = hash(&src[srcIdx - 1]);
-            const int32 h3 = hash(&src[srcIdx - 0]);
-            _hashes[h0] = srcIdx - 3;
-            _hashes[h1] = srcIdx - 2;
-            _hashes[h2] = srcIdx - 1;
-            _hashes[h3] = srcIdx - 0;
+            const int32 hh0 = hash(&src[srcIdx - 3]);
+            const int32 hh1 = hash(&src[srcIdx - 2]);
+            const int32 hh2 = hash(&src[srcIdx - 1]);
+            const int32 hh3 = hash(&src[srcIdx - 0]);
+            _hashes[hh0] = srcIdx - 3;
+            _hashes[hh1] = srcIdx - 2;
+            _hashes[hh2] = srcIdx - 1;
+            _hashes[hh3] = srcIdx - 0;
         }
 
         while (++srcIdx < anchor) {