Incres usage of logging framework

Author: attah

lib/ippattr.h

@@ -6,7 +6,6 @@
 #include "variant.h"
 
 #include <cstdint>
-#include <iostream>
 #include <map>
 #include <string>
 

lib/ippdiscovery.cpp

@@ -5,7 +5,6 @@
 
 #include <chrono>
 #include <cstring>
-#include <iostream>
 #include <set>
 #include <sstream>
 #include <stdexcept>
@@ -359,7 +358,7 @@ void IppDiscovery::discover()
     }
     catch(const std::exception& e)
     {
-      std::cerr << e.what();
+      DBG(<< e.what());
     }
 
     DBG(<< "------------");

lib/ippmsg.cpp

@@ -1,6 +1,5 @@
 #include "ippmsg.h"
-
-#include <iostream>
+#include "log.h"
 
 uint32_t IppMsg::_reqId=1;
 
@@ -31,10 +30,8 @@ IppMsg::IppMsg(Bytestream& msg)
       }
       else if(currentAttrType == IppTag::UnsupportedAttrs)
       {
-#ifndef FUZZ // Too much spam for fuzzing
-        std::cerr << "WARNING: unsupported attrs reported: " << std::endl
-                  << attrs.toJSON().dump();
-#endif
+        WARN(<< "WARNING: unsupported attrs reported: " << std::endl
+             << attrs.toJSON().dump());
       }
 
       if(msg >>= (uint8_t)IppTag::EndAttrs)
@@ -456,7 +453,7 @@ void IppMsg::encodeValue(Bytestream& msg, IppTag tag, const IppValue& val) const
       break;
     }
     default:
-      std::cerr << "uncaught tag " << +(uint8_t)tag;
+      ERROR(<< "uncaught tag " << +(uint8_t)tag);
       throw std::logic_error("Uncaught tag");
   }
 }

lib/ippprinter.cpp

@@ -588,7 +588,7 @@ void IppPrinter::_applyOverrides()
       Json overridesJson = Json::parse(bts.getString(bts.size()), errStr);
       if(!errStr.empty())
       {
-        std::cerr << "Bad overrides file: " << errStr << std::endl;
+        WARN(<< "Bad overrides file: " << errStr);
       }
       for(const auto& [matchAttrName, matchAttr] : overridesJson.object_items())
       {
@@ -609,6 +609,6 @@ void IppPrinter::_applyOverrides()
   }
   catch(const std::exception& e)
   {
-      std::cerr << "Exception applying overrides: " << e.what() << std::endl;
+      WARN(<< "Exception applying overrides: " << e.what());
   }
 }

lib/log.h

@@ -1,11 +1,14 @@
 #ifndef LOG_H
 #define LOG_H
 
-#include <map>
+#include <iostream>
+#include <set>
 
 #define LOG(category, ...) if(LogController::instance().isEnabled(category))\
                            {std::cerr __VA_ARGS__ << std::endl;}
 #define DBG(...) LOG(LogController::Debug, __VA_ARGS__)
+#define WARN(...) LOG(LogController::Warning, __VA_ARGS__)
+#define ERROR(...) LOG(LogController::Error, __VA_ARGS__)
 
 class LogController
 {
@@ -25,26 +28,28 @@ class LogController
 
   enum Category
   {
-    Debug
+    Debug,
+    Warning,
+    Error
   };
 
   void enable(Category category)
   {
-    _enabled[category] = true;
+    _enabled.insert(category);
   }
 
   void disable(Category category)
   {
-    _enabled[category] = false;
+    _enabled.erase(category);
   }
 
   bool isEnabled(Category category)
   {
-    return _enabled[category];
+    return _enabled.find(category) != _enabled.cend();
   }
 
 private:
-  std::map<Category, bool> _enabled;
+  std::set<Category> _enabled {Warning, Error};
 
 };
 

lib/ppm2pwg.cpp

@@ -7,7 +7,6 @@
 #include "urfpghdr.h"
 
 #include <cstring>
-#include <iostream>
 #include <map>
 
 void make_pwg_hdr(Bytestream& outBts, const PrintParameters& params, bool backside);