clean up of output

NivDeveloper · Mar 21, 2023 · 823d37f · 823d37f
1 parent 9a1a07c
commit 823d37f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/build/SimComp b/build/SimComp
diff --git a/src/SimComp.cpp b/src/SimComp.cpp
@@ -27,7 +27,7 @@
 
 int main(int argc, char** argv)
 {
-    if (argc == 7 && strcmp(argv[1], "-c") == 0 && strcmp(argv[3], "-o") == 0)
+    if (argc >= 5 && strcmp(argv[1], "-c") == 0 && strcmp(argv[3], "-o") == 0)
     {
         //call compression function
         std::cout << "compressing file..." << std::endl;
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
         auto stop = std::chrono::steady_clock::now();
         if (comp != Z_OK)
         {
-            std::cout << "error occured" << std::endl;
+            utils::zlibError(comp);
             return -1;
         }
         fseek(in, 0L, SEEK_END);
@@ -68,7 +68,7 @@ int main(int argc, char** argv)
         auto stop = std::chrono::steady_clock::now();
         if (comp != Z_OK)
         {
-            std::cout << "error occured" << std::endl;
+            utils::zlibError(comp);
             return -1;
         }
         fseek(in, 0L, SEEK_END);

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -64,7 +64,7 @@ namespace utils
         std::cout << "input size:\t\t" << decomp << " bytes" << std::endl;
         std::cout << "output size:\t\t" << comp  << " bytes"<< std::endl;
         std::cout << "Compression Ratio:\t" << std::setprecision(4) << (float(decomp)/float(comp)) << std::endl;
-        std::cout << "compression duration:\t" << elapsed.count() << " microseconds" <<  std::endl;  
+        std::cout << "Compression duration:\t" << elapsed.count() << " microseconds" <<  std::endl;  
     }
 
 
@@ -134,7 +134,28 @@ namespace utils
         std::cout << "input size:\t\t" << comp << " bytes" << std::endl;
         std::cout << "output size:\t\t" << decomp  << " bytes"<< std::endl;
         std::cout << "Decompression Ratio:\t" << std::setprecision(4) << ((float(decomp)/float(comp))) << std::endl;
-        std::cout << "compression duration:\t" << elapsed.count() << " microseconds" <<  std::endl;
+        std::cout << "Decompression duration:\t" << elapsed.count() << " microseconds" <<  std::endl;
+    }
+
+    void zlibError(int ret)
+    {
+        std::cout << "zlib ERROR!: ";
+        switch (ret) {
+        case Z_ERRNO:
+            std::cout << "i/o Error.";
+            break;
+        case Z_STREAM_ERROR:
+            std::cout << "invalid compression level." << std::endl;
+            break;
+        case Z_DATA_ERROR:
+            std::cout << "invalid or incomplete deflate data" << std::endl;
+            break;
+        case Z_MEM_ERROR:
+            std::cout << "out of memory." << std::endl;
+            break;
+        case Z_VERSION_ERROR:
+            std::cout << "zlib version does not match between included header and link file." << std::endl;
+        }
     }
 
 }
diff --git a/src/utils.h b/src/utils.h
@@ -16,7 +16,7 @@ namespace utils
     void compDiagnostics(char* inName, char* outname, size_t decomp, size_t comp, int level, std::chrono::duration<int64_t, std::micro> elapsed);
     int decompress(FILE* source, FILE* dest);
     void decompDiagnostics(char* inName, char* outname, size_t decomp, size_t comp, std::chrono::duration<int64_t, std::micro> elapsed);
-
+    void zlibError(int ret);
 
 
 }