remove redundant g_setBlackList, rename g_settings_setBlackList to g_settings_setBlackListedPkgs

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

5 files changed, 4 insertions, 18 deletions

diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 57e560e0..b75af52b 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -165,11 +165,6 @@ static int SetUpMW()
     {
         LoadOpenGPGPublicKey(it_k->c_str());
     }
-    set_string_t::iterator it_b = g_settings_mapBlackList.begin();
-    for (; it_b != g_settings_mapBlackList.end(); it_b++)
-    {
-        g_setBlackList.insert(*it_b);
-    }
     VERB1 log("Adding actions or reporters");
     vector_pair_string_string_t::iterator it_ar = g_settings_vectorActionsAndReporters.begin();
     for (; it_ar != g_settings_vectorActionsAndReporters.end(); it_ar++)
diff --git a/src/Daemon/Daemon.h b/src/Daemon/Daemon.h
index 67a97ca7..4f01d17e 100644
--- a/src/Daemon/Daemon.h
+++ b/src/Daemon/Daemon.h
@@ -33,9 +33,4 @@ extern CCommLayerServer *g_pCommLayer;
 /* Collection of loaded plugins */
 extern CPluginManager* g_pPluginManager;
 
-/**
- * A set of blacklisted packages.
- */
-extern set_string_t g_setBlackList;
-
 #endif
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 667a36f8..4f9a7058 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -38,10 +38,6 @@ using namespace std;
  */
 CPluginManager* g_pPluginManager;
 /**
- * A set of blacklisted packages.
- */
-set_string_t g_setBlackList;
-/**
  * An instance of CRPM used for package checking.
  * @see RPM.h
  */
@@ -738,7 +734,7 @@ static mw_result_t SavePackageDescriptionToDebugDump(
         VERB2 log("Package:'%s' short:'%s'", rpm_pkg, packageName.c_str());
         free(rpm_pkg);
 
-        if (g_setBlackList.find(packageName) != g_setBlackList.end())
+        if (g_settings_setBlackListedPkgs.find(packageName) != g_settings_setBlackListedPkgs.end())
         {
             log("Blacklisted package '%s'", packageName.c_str());
             return MW_BLACKLISTED;
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 2a516324..860a3f86 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -53,7 +53,7 @@ static map_string_t s_mapSectionCron;
 bool          g_settings_bOpenGPGCheck = false;
 /* one line: "OpenGPGPublicKeys = value1,value2" */
 set_string_t  g_settings_setOpenGPGPublicKeys;
-set_string_t  g_settings_mapBlackList;
+set_string_t  g_settings_setBlackListedPkgs;
 std::string   g_settings_sDatabase;
 unsigned int  g_settings_nMaxCrashReportsSize = 1000;
 bool          g_settings_bProcessUnpackaged = false;
@@ -173,7 +173,7 @@ static void ParseCommon()
     it = s_mapSectionCommon.find("BlackList");
     if (it != end)
     {
-        g_settings_mapBlackList = ParseList(it->second.c_str());
+        g_settings_setBlackListedPkgs = ParseList(it->second.c_str());
     }
     it = s_mapSectionCommon.find("Database");
     if (it != end)
diff --git a/src/Daemon/Settings.h b/src/Daemon/Settings.h
index fda1b0d8..c85ee893 100644
--- a/src/Daemon/Settings.h
+++ b/src/Daemon/Settings.h
@@ -26,7 +26,7 @@ typedef map_vector_pair_string_string_t map_cron_t;
 typedef map_map_string_t map_abrt_settings_t;
 
 extern set_string_t  g_settings_setOpenGPGPublicKeys;
-extern set_string_t  g_settings_mapBlackList;
+extern set_string_t  g_settings_setBlackListedPkgs;
 extern unsigned int  g_settings_nMaxCrashReportsSize;
 extern bool          g_settings_bOpenGPGCheck;
 extern bool          g_settings_bProcessUnpackaged;