Merge branch '125-fix-sonar-issues' into develop

Author: HerbertKoelman

CHANGELOG

@@ -1,4 +1,7 @@
 2.3.0
+- Remove extern "C" (#127)
+- Remove commented out code (#126)
+- make logger::logger rule zero compliant (#123)
 - write more logger::sink tests (#124)
 - fixed a bug in ./tests/CMakeLists.txt that prevented exception_tests to be run (#121)
 - activate soanrcloud checks (#120)

cmake/SonarCloudConfig.cmake

@@ -48,7 +48,7 @@ if ( SONAR )
     message(SEND_ERROR "Failed to find the program [sonar_scanner], make sure sonar tools are installed.")
   endif()
 
-else()
-  message(WARNING "SONAR cloud build is turned off, use -DSONAR=yes to turn in ON")
+#else()
+#  message(WARNING "SONAR cloud build is turned off, use -DSONAR=yes to turn in ON")
 endif()
 

include/logger/cpp-logger.hpp

@@ -17,7 +17,7 @@ namespace logger {
 
  /** @return the library's current version
   */
-  extern "C" const char *cpp_logger_version();
+  const char *cpp_logger_version();
 
  /** @} */
   }

include/logger/facilities.hpp

@@ -65,8 +65,6 @@ namespace logger {
                 // intentional...
             }
 
-            // virtual ~facility() ;
-
         private:
             const facility_code _code;
             const char         *_keyword;

include/logger/logger.hpp

@@ -190,13 +190,9 @@ namespace logger {
        */
       logger( const std::string &name, sink *sink);
 
-      /** dispose of logger's ressources
-       */
-      virtual ~logger();
-
     private:
 
-      sink        *_sink; //!< logger delegate to a sink the actual magic to write log messages
+      std::unique_ptr<sink>        _sink; //!< logger delegate to a sink the actual magic to write log messages
 
       std::string _name; //!< logger's name
     }; // logger

include/logger/registry.hpp

@@ -147,7 +147,9 @@ namespace logger {
         template<class T, typename... Args> logger_ptr get( const std::string &name, const Args&... args){
           std::lock_guard<std::mutex> lck(_mutex);
 
-          // printf("DEBUG logger::registry.get(%s, %d);\n", name.c_str(), _level);
+#         ifdef DEBUG
+          printf("DEBUG logger::registry.get(%s, %d);\n", name.c_str(), _level);
+#         endif
 
           logger_ptr logger;
           auto search = _loggers.find(name);
@@ -178,7 +180,6 @@ namespace logger {
         };
 
         ~registry() = default;
-        // ~registry() { std::cout << "DEBUG delete registry..." << std::endl ; };
 
       private:
 

include/logger/sinks.hpp

@@ -170,8 +170,6 @@ namespace logger {
          */
         explicit file_sink(FILE *file);
 
-        // virtual ~file_sink() ;
-
         /** \copydoc sink::write()
          *
          * This sink writes messages in FILE.
@@ -293,7 +291,7 @@ namespace logger {
          */
         explicit syslog_sink();
 
-        ~syslog_sink() = default ; //override ;
+        ~syslog_sink() = default ;
 
         /** \copydoc  sink::write
          *

src/cpp-logger.cpp

@@ -13,7 +13,7 @@
 
 namespace logger {
 
-    extern "C" const char *cpp_logger_version(){
+    const char *cpp_logger_version(){
 
     #ifndef CPP_LOGGER_VERSION
       return "missing CPP_LOGGER_VERSION define. Re-run configure" ;

src/file_sink.cpp

@@ -50,11 +50,6 @@ namespace logger {
         _lag = buffer;
     };
 
-// TODO remove this
-//    file_sink::~file_sink() {
-//        //fflush(_file_descriptor);
-//    };
-
     void file_sink::set_name(const std::string &name) {
         sink::set_name(name);
 
@@ -85,7 +80,7 @@ namespace logger {
 
             // new character vector
             // vsnprintf returns the needed characters to store the output
-            // not possible with XL C/C++ std::vector<char> buf(1+std::vsnprintf(NULL, 0, fmt, args1));
+            //NOSONAR not possible with XL C/C++ std::vector<char> buf(1+std::vsnprintf(NULL, 0, fmt, args1));
 
             // this call only returns the actual number of bytes needed to store the message.
             // It doesn't count the needed end-of-string

src/logger.cpp

@@ -14,15 +14,8 @@ namespace logger {
     // constructors & destructors -------------------------------------
     //
 
-    logger::logger(const std::string &name, sink *sink) : _sink(NULL), _name (name) {
-        _sink = sink;
-    }
-
-    logger::~logger() {
-        // printf("DEBUG %s destructor (%s,%d).\n", __FUNCTION__, __FILE__, __LINE__);
-        if (_sink != NULL) {
-            delete _sink;
-        }
+    logger::logger(const std::string &name, sink *sink) : _name (name) {
+        _sink.reset(sink);
     }
 
     std::string logger::ecid() {