Only log if LIBUDEV_STUB_LOGGING environment variable is set

CMakeLists.txt

@@ -1,14 +1,9 @@
 cmake_minimum_required (VERSION 3.5)
 project(libudev_stub)
 
-# libudev-stub requires a C++11 compiler
-include(CMakeForceCompiler)
-cmake_force_c_compiler(gcc-6 GCC)
-cmake_force_cxx_compiler(g++-6 GCC)
-
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 0)
+set(CPACK_PACKAGE_VERSION_PATCH 1)
 set(LIBUDEV_STUB_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(LIBUDEV_SOVERSION_MAJOR "1")
 set(LIBUDEV_SOVERSION "1.6.4")

libudev/libudev-monitor.cpp

@@ -198,6 +198,7 @@ _public_ int udev_monitor_filter_remove(struct udev_monitor* udev_monitor) {
       ret = loader->udev_monitor_filter_remove(udev_monitor->proxy);
     }
   }
+  return ret;
 }
 
 }  // extern "C"

libudev/libudev.cpp

@@ -25,15 +25,22 @@
 #include "libudev-internal.h"
 #include "libudev1.h"
 
+bool g_logging = false;
+
 using namespace libudev_stub;
 
+#if 0
+//  This was included to fire when the stub is loaded
+//  Becomes verbose if one is loading libudev a lot,
+//  so forget it; the logging was for debug purposes anyway
 class StubEntry {
 public:
   StubEntry() {
     LOG() << "Using libudev-stub " << STR(LIBUDEV_STUB_VERSION);
   }
 };
 static StubEntry entry;
+#endif
 
 extern "C" {
 
@@ -69,6 +76,9 @@ _public_ struct udev* udev_new(void) {
   struct udev* new_udev = new udev;
   new_udev->loader = NULL;
   new_udev->loader_udev = NULL;
+  char* logenv = secure_getenv("LIBUDEV_STUB_LOGGING");
+  g_logging = (logenv) ? false : true;
+
   char* library = secure_getenv("LIBUDEV_STUB_PASSTHROUGH");
   if (library) {
     LOG() << "found LIBUDEV_STUB_PASSTHROUGH = " << library;

libudev/logging.h

@@ -1,6 +1,8 @@
 #include <iostream>
 #include <sstream>
 
+extern bool g_logging;
+
 namespace libudev_stub {
 
 #define LOG() LogMessage().get()
@@ -9,7 +11,9 @@ class LogMessage {
 public:
   LogMessage() {}
   virtual ~LogMessage() {
-    std::cout << "UDEV STUB: " << msg_.str().c_str() << std::endl;
+    if (g_logging) {
+      std::cout << "UDEV STUB: " << msg_.str().c_str() << std::endl;
+    }
   }
 
   std::ostringstream& get(void) {