Some code cleanup. In main, use return not exit (Valgrind)

Author: flanglet

src/Context.hpp

@@ -17,19 +17,12 @@ limitations under the License.
 #ifndef _Context_
 #define _Context_
 
+#include <map>
 #include <sstream>
 #include <string>
 #include "concurrent.hpp"
 #include "util/strings.hpp"
 
-#if __cplusplus >= 201103L
-   #include <unordered_map>
-   #define CTX_MAP std::unordered_map
-#else
-   #include <map>
-   #define CTX_MAP std::map
-#endif
-
 namespace kanzi
 {
 
@@ -75,7 +68,7 @@ namespace kanzi
 #endif
 
    private:
-       CTX_MAP<std::string, ContextVal> _map;
+       std::map<std::string, ContextVal> _map;
 
 #ifdef CONCURRENCY_ENABLED
        ThreadPool* _pool;
@@ -97,7 +90,7 @@ namespace kanzi
 
    inline int64 Context::getLong(const std::string& key, int64 defValue) const
    {
-      CTX_MAP<std::string, ContextVal>::const_iterator it = _map.find(key);
+      std::map<std::string, ContextVal>::const_iterator it = _map.find(key);
 
       if (it == _map.end())
           return defValue;
@@ -108,7 +101,7 @@ namespace kanzi
 
    inline std::string Context::getString(const std::string& key, const std::string& defValue) const
    {
-      CTX_MAP<std::string, ContextVal>::const_iterator it = _map.find(key);
+      std::map<std::string, ContextVal>::const_iterator it = _map.find(key);
 
       if (it == _map.end())
           return defValue;

src/app/Kanzi.cpp

@@ -273,7 +273,7 @@ bool toInt(string& s, int& res)
    return true;
 }
 
-int processCommandLine(int argc, const char* argv[], Context& map)
+int processCommandLine(int argc, const char* argv[], Context& map, Printer& log)
 {
     string inputName;
     string outputName;
@@ -296,7 +296,6 @@ int processCommandLine(int argc, const char* argv[], Context& map)
     int blockSize = -1;
     int autoBlockSize = -1;
     string mode;
-    Printer log(cout);
     bool showHeader = true;
     bool showHelp = false;
 
@@ -910,15 +909,16 @@ int main(int argc, const char* argv[])
 #endif
 
     Context args;
-    int status = processCommandLine(argc, argv, args);
+    Printer log(cout);
+    int status =  processCommandLine(argc, argv, args, log);
 
     // Command line processing error ?
     if (status != 0)
-       exit(status);
+       return status;
 
     // Help mode only ?
     if (args.has("mode") == false)
-       exit(0);
+       return 0;
 
     string mode = args.getString("mode");
     int jobs = args.getInt("jobs", -1);
@@ -929,7 +929,6 @@ int main(int argc, const char* argv[])
             const int verbosity = args.getInt("verbosity");
             stringstream ss;
             ss << "Warning: the number of jobs is limited to 1 in this version";
-            Printer log(cout);
             log.println(ss.str(), verbosity > 0);
         }
 
@@ -948,7 +947,6 @@ int main(int argc, const char* argv[])
             const int verbosity = args.getInt("verbosity");
             stringstream ss;
             ss << "Warning: the number of jobs is too high, defaulting to " << MAX_CONCURRENCY;
-            Printer log(cout);
             log.println(ss.str(), verbosity > 0);
             jobs = MAX_CONCURRENCY;
         }
@@ -968,11 +966,11 @@ int main(int argc, const char* argv[])
                 BlockCompressor bc(ctx);
                 uint64 written = 0;
                 int code = bc.compress(written);
-                exit(code);
+                return code;
             }
             catch (exception& e) {
                 cerr << "Could not create the compressor: " << e.what() << endl;
-                exit(Error::ERR_CREATE_COMPRESSOR);
+                return Error::ERR_CREATE_COMPRESSOR;
             }
         }
 
@@ -981,11 +979,11 @@ int main(int argc, const char* argv[])
                 BlockDecompressor bd(ctx);
                 uint64 read = 0;
                 int code = bd.decompress(read);
-                exit(code);
+                return code;
             }
             catch (exception& e) {
                 cerr << "Could not create the decompressor: " << e.what() << endl;
-                exit(Error::ERR_CREATE_DECOMPRESSOR);
+                return Error::ERR_CREATE_DECOMPRESSOR;
             }
         }
 
@@ -995,11 +993,11 @@ int main(int argc, const char* argv[])
     catch (invalid_argument& e) {
        // May be thrown by ThreadPool
        cerr << e.what() << endl;
-       exit(Error::ERR_INVALID_PARAM);
+       return Error::ERR_INVALID_PARAM;
     }
     catch (runtime_error& e) {
        // May be thrown by ThreadPool
        cerr << e.what() << endl;
-       exit(Error::ERR_INVALID_PARAM);
+       return Error::ERR_INVALID_PARAM;
     }
 }

src/transform/BWTBlockCodec.cpp

@@ -101,8 +101,7 @@ bool BWTBlockCodec::inverse(SliceArray<byte>& input, SliceArray<byte>& output, i
 
     if (_bsVersion > 5) {
        // Number of chunks and primary index size in bitstream since bsVersion 6
-       const byte* src = &input._array[input._index];
-       byte mode = src[0];
+       byte mode = input._array[input._index++];
        const uint logNbChunks = uint(mode >> 2) & 0x07;
        const int pIndexSize = (int(mode) & 0x03) + 1;
 
@@ -117,24 +116,23 @@ bool BWTBlockCodec::inverse(SliceArray<byte>& input, SliceArray<byte>& output, i
        const int headerSize = 1 + chunks * pIndexSize;
 
        if ((input._length < headerSize) || (blockSize < headerSize))
-          return false;
+           return false;
 
        // Read header
-       for (int i = 0, idx = 1; i < chunks; i++) {
+       for (int i = 0; i < chunks; i++) {
            int shift = (pIndexSize - 1) << 3;
            int primaryIndex = 0;
 
            // Extract BWT primary index
            while (shift >= 0) {
-               primaryIndex = (primaryIndex << 8) | int(src[idx++]);
+               primaryIndex = (primaryIndex << 8) | int(input._array[input._index++]);
                shift -= 8;
            }
 
            if (_pBWT->setPrimaryIndex(i, primaryIndex + 1) == false)
                return false;
        }
 
-       input._index += headerSize;
        blockSize -= headerSize;
     }
     else {

src/util/Printer.hpp

@@ -30,7 +30,7 @@ namespace kanzi
    {
       public:
          Printer(std::ostream& os) { _os = &os; }
-         ~Printer() {}
+         ~Printer() { _os->flush(); }
 
          void print(const char* msg, bool print) {
             if ((print == true) && (msg != nullptr)) {