3 files changed, 11 insertions, 4 deletions
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index cba81f1..697a9a0 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -200,6 +200,9 @@ void *CCrashWatcher::create_report(void *arg)
     free(thread_data->UID);
     free(thread_data->dest);
     free(thread_data);
+
+    /* Bogus value. pthreads require us to return void* */
+    return NULL;
 }
 
 gboolean CCrashWatcher::cron_activation_periodic_cb(gpointer data)
@@ -885,4 +888,7 @@ vector_map_string_string_t CCrashWatcher::GetPluginsInfo()
         }
         Warning(e.what());
     }
+    // TODO: is it right? I added it just to disable a warning...
+    // but maybe returning empty map is wrong here?
+    return vector_map_string_string_t();
 }
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index b8b350c..3a6c8fc 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -17,6 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
+#include "abrtlib.h"
 #include "CrashWatcher.h"
 #include "ABRTException.h"
 #include <iostream>
@@ -93,8 +94,8 @@ int main(int argc, char** argv)
              * Otherwise fprintf(stderr) dumps messages into random fds, etc. */
             close(STDOUT_FILENO);
             close(STDERR_FILENO);
-            dup(0);
-            dup(0);
+            xdup(0);
+            xdup(0);
         }
         g_pCrashWatcher = new CCrashWatcher(DEBUG_DUMPS_DIR);
         if (daemonize)
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 2a8688e..6ebeffd 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -28,8 +28,8 @@
 CMiddleWare::CMiddleWare(const std::string& pPluginsConfDir,
                          const std::string& pPluginsLibDir) :
     m_pPluginManager(NULL),
-    m_bOpenGPGCheck(true),
-    m_sPluginsConfDir(pPluginsConfDir)
+    m_sPluginsConfDir(pPluginsConfDir),
+    m_bOpenGPGCheck(true)
 {
     m_pPluginManager = new CPluginManager(pPluginsConfDir, pPluginsLibDir);
     m_pPluginManager->LoadPlugins();