eliminate AddOpenGPGPublicKey() and AddBlackListedPackage() stubs

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

6 files changed, 14 insertions, 43 deletions

diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index 022d4805..0c1ef679 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -166,10 +166,7 @@ DBus::Message CCommLayerServerDBus::_GetPluginsInfo_stub(const DBus::CallMessage
 }
 vector_map_string_string_t CCommLayerServerDBus::GetPluginsInfo()
 {
-    //FIXME: simplify?
-    vector_map_string_string_t plugins_info;
-    plugins_info = m_pObserver->GetPluginsInfo();
-    return plugins_info;
+    return m_pObserver->GetPluginsInfo();
 }
 
 DBus::Message CCommLayerServerDBus::_GetPluginSettings_stub(const DBus::CallMessage &call)
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 26e906fa..01629f0b 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -175,19 +175,16 @@ static void *create_report(void *arg)
 uint64_t CCrashWatcher::CreateReport_t(const std::string &pUUID,const std::string &pUID, const std::string &pSender)
 {
     thread_data_t *thread_data = (thread_data_t *)xzalloc(sizeof(thread_data_t));
-    if (thread_data != NULL)
+    thread_data->UUID = xstrdup(pUUID.c_str());
+    thread_data->UID = xstrdup(pUID.c_str());
+    thread_data->dest = xstrdup(pSender.c_str());
+    if (pthread_create(&(thread_data->thread_id), NULL, create_report, (void *)thread_data) != 0)
     {
-        thread_data->UUID = xstrdup(pUUID.c_str());
-        thread_data->UID = xstrdup(pUID.c_str());
-        thread_data->dest = xstrdup(pSender.c_str());
-        if (pthread_create(&(thread_data->thread_id), NULL, create_report, (void *)thread_data) != 0)
-        {
-            throw CABRTException(EXCEP_FATAL, "CCrashWatcher::CreateReport_t(): Cannot create thread!");
-        }
-    }
-    else
-    {
-        throw CABRTException(EXCEP_FATAL, "CCrashWatcher::CreateReport_t(): Cannot allocate memory!");
+        free(thread_data->UUID);
+        free(thread_data->UID);
+        free(thread_data->dest);
+        free(thread_data);
+        throw CABRTException(EXCEP_FATAL, "CCrashWatcher::CreateReport_t(): Cannot create thread!");
     }
     //FIXME: we don't use this value anymore, so fix the API
     return 0;
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 60341f77..53b865ce 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -151,12 +151,12 @@ static void SetUpMW()
     set_strings_t::iterator it_k = g_settings_setOpenGPGPublicKeys.begin();
     for (; it_k != g_settings_setOpenGPGPublicKeys.end(); it_k++)
     {
-        AddOpenGPGPublicKey(*it_k);
+        g_RPM.LoadOpenGPGPublicKey(*it_k);
     }
     set_strings_t::iterator it_b = g_settings_mapSettingsBlackList.begin();
     for (; it_b != g_settings_mapSettingsBlackList.end(); it_b++)
     {
-        AddBlackListedPackage(*it_b);
+        g_setBlackList.insert(*it_b);
     }
     set_strings_t::iterator it_p = g_settings_setEnabledPlugins.begin();
     for (; it_p != g_settings_setEnabledPlugins.end(); it_p++)
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 4dff8f76..5c86a1d3 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -682,16 +682,6 @@ vector_pair_string_string_t GetUUIDsOfCrash(const std::string& pUID)
     return UUIDsUIDs;
 }
 
-void AddOpenGPGPublicKey(const std::string& pKey)
-{
-    g_RPM.LoadOpenGPGPublicKey(pKey);
-}
-
-void AddBlackListedPackage(const std::string& pPackage)
-{
-    g_setBlackList.insert(pPackage);
-}
-
 void AddAnalyzerActionOrReporter(const std::string& pAnalyzer,
                                               const std::string& pAnalyzerOrReporter,
                                               const std::string& pArgs)
diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h
index 97d08cb4..b781e65f 100644
--- a/src/Daemon/MiddleWare.h
+++ b/src/Daemon/MiddleWare.h
@@ -20,7 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-
 #ifndef MIDDLEWARE_H_
 #define MIDDLEWARE_H_
 
@@ -57,9 +56,6 @@ typedef std::map<std::string, vector_strings_t> report_status_t;
 typedef std::map<std::string, vector_pair_string_string_t> map_analyzer_actions_and_reporters_t;
 
 
-extern CPluginManager* g_pPluginManager;
-
-
 /**
  * Takes care of getting all additional data needed
  * for computing UUIDs and creating a report for particular analyzer
@@ -149,15 +145,6 @@ mw_result_t GetCrashInfo(const std::string& pUUID,
  */
 vector_pair_string_string_t GetUUIDsOfCrash(const std::string& pUID);
 /**
- * Adds one path to a GPG public key into MW's set.
- * @param pKey A path to a GPG public key.
- */
-void AddOpenGPGPublicKey(const std::string& pKey);
-/**
- * Adds one blacklisted package.
- */
-void AddBlackListedPackage(const std::string& pPackage);
-/**
  * Adds one association among alanyzer plugin and its
  * action and reporter plugins.
  * @param pAnalyzer A name of an analyzer plugin.
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp
index 2d81c47e..3d698b16 100644
--- a/src/Daemon/PluginManager.cpp
+++ b/src/Daemon/PluginManager.cpp
@@ -316,8 +316,8 @@ plugin_type_t CPluginManager::GetPluginType(const std::string& pName)
 vector_map_string_string_t CPluginManager::GetPluginsInfo()
 {
     vector_map_string_string_t ret;
-    map_abrt_plugins_t::iterator it_abrt_plugin;
-    for (it_abrt_plugin = m_mapABRTPlugins.begin(); it_abrt_plugin != m_mapABRTPlugins.end(); it_abrt_plugin++)
+    map_abrt_plugins_t::iterator it_abrt_plugin = m_mapABRTPlugins.begin();
+    for (; it_abrt_plugin != m_mapABRTPlugins.end(); it_abrt_plugin++)
     {
         map_string_string_t plugin_info;