Cleanup. Remove last vestiges of AnalyzerActionsAndReporters.

Also: made one function static, made dd_delete() call dd_close().

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

8 files changed, 5 insertions, 160 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 8a011abb..b25be6f9 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -264,21 +264,6 @@ static gboolean cron_activation_reshedule_cb(gpointer data)
     return FALSE;
 }
 
-static int SetUpMW()
-{
-    VERB1 log("Adding analyzers, actions or reporters");
-    map_analyzer_actions_and_reporters_t::iterator it_aar = g_settings_mapAnalyzerActionsAndReporters.begin();
-    for (; it_aar != g_settings_mapAnalyzerActionsAndReporters.end(); it_aar++)
-    {
-        vector_pair_string_string_t::iterator it_ar = it_aar->second.begin();
-        for (; it_ar != it_aar->second.end(); it_ar++)
-        {
-            AddAnalyzerActionOrReporter(it_aar->first.c_str(), it_ar->first.c_str(), it_ar->second.c_str());
-        }
-    }
-    return 0;
-}
-
 static int SetUpCron()
 {
     map_cron_t::iterator it_c = g_settings_mapCron.begin();
@@ -942,8 +927,6 @@ int main(int argc, char** argv)
         g_pPluginManager = new CPluginManager();
         g_pPluginManager->LoadPlugins();
 
-        if (SetUpMW() != 0) /* logging is inside */
-            throw 1;
         if (SetUpCron() != 0)
             throw 1;
 
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index d40b1456..1f849e9b 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -35,14 +35,6 @@ using namespace std;
  */
 CPluginManager* g_pPluginManager;
 
-/**
- * A map, which associates particular analyzer to one or more
- * action or reporter plugins. These are activated when a crash, which
- * is maintained by particular analyzer, occurs.
- */
-typedef std::map<std::string, vector_pair_string_string_t> map_analyzer_actions_and_reporters_t;
-static map_analyzer_actions_and_reporters_t s_mapAnalyzerActionsAndReporters;
-
 
 /**
  * Transforms a debugdump directory to inner crash
@@ -609,7 +601,7 @@ mw_result_t FillCrashInfo(const char *crash_id,
     return MW_OK;
 }
 
-void GetUUIDsOfCrash(long caller_uid, vector_string_t &result)
+static void GetUUIDsOfCrash(long caller_uid, vector_string_t &result)
 {
     CDatabase* database = g_pPluginManager->GetDatabase(g_settings_sDatabase);
     database->Connect();
@@ -627,13 +619,6 @@ void GetUUIDsOfCrash(long caller_uid, vector_string_t &result)
     db_list_free(rows);
 }
 
-void AddAnalyzerActionOrReporter(const char *pAnalyzer,
-                                              const char *pAnalyzerOrReporter,
-                                              const char *pArgs)
-{
-    s_mapAnalyzerActionsAndReporters[pAnalyzer].push_back(make_pair(std::string(pAnalyzerOrReporter), std::string(pArgs)));
-}
-
 vector_map_crash_data_t GetCrashInfos(long caller_uid)
 {
     vector_map_crash_data_t retval;
diff --git a/src/daemon/MiddleWare.h b/src/daemon/MiddleWare.h
index 4ca4187e..bf7a5807 100644
--- a/src/daemon/MiddleWare.h
+++ b/src/daemon/MiddleWare.h
@@ -112,25 +112,6 @@ mw_result_t SaveDebugDump(const char *pDebugDumpDir,
  */
 mw_result_t FillCrashInfo(const char *crash_id,
                         map_crash_data_t& pCrashData);
-/**
- * Gets all local UUIDs and UIDs of crashes. These crashes
- * occurred when a particular user was logged in.
- * @param pUID an UID of an user.
- * @return A vector of pairs  (local UUID, UID).
- */
-void GetUUIDsOfCrash(long caller_uid, vector_string_t &result);
-/**
- * Adds one association among alanyzer plugin and its
- * action and reporter plugins.
- * @param pAnalyzer A name of an analyzer plugin.
- * @param pActionOrReporter A name of an action or reporter plugin.
- * @param pArgs An arguments for action or reporter plugin.
- */
-void AddAnalyzerActionOrReporter(const char *pAnalyzer,
-                                 const char *pActionOrReporter,
-                                 const char *pArgs);
-
-//bool analyzer_has_InformAllUsers(const char *analyzer_name);
 
 vector_map_crash_data_t GetCrashInfos(long caller_uid);
 int  CreateReportThread(const char* crash_id, long caller_uid, int force, const char* pSender);
diff --git a/src/daemon/Settings.cpp b/src/daemon/Settings.cpp
index 0f358b2a..d1cd271a 100644
--- a/src/daemon/Settings.cpp
+++ b/src/daemon/Settings.cpp
@@ -21,7 +21,6 @@
 #include "Polkit.h"
 
 #define SECTION_COMMON      "Common"
-#define SECTION_ANALYZER_ACTIONS_AND_REPORTERS   "AnalyzerActionsAndReporters"
 #define SECTION_CRON        "Cron"
 
 /* Conf file has this format:
@@ -39,8 +38,6 @@
  * If the same name found on more than one line,
  * the values are appended, separated by comma: map["name"] = "value1,value2" */
 static map_string_t s_mapSectionCommon;
-/* ... from [ AnalyzerActionsAndReporters ] */
-static map_string_t s_mapSectionAnalyzerActionsAndReporters;
 /* ... from [ Cron ] */
 static map_string_t s_mapSectionCron;
 
@@ -59,9 +56,6 @@ char *g_settings_sWatchCrashdumpArchiveDir = NULL;
 unsigned int  g_settings_nMaxCrashReportsSize = 1000;
 bool          g_settings_bProcessUnpackaged = false;
 
-/* [ AnalyzerActionsAndReporters ] */
-/* many lines, one per key: "map_key = aa_first,bb_first(bb_second),cc_first" */
-map_analyzer_actions_and_reporters_t g_settings_mapAnalyzerActionsAndReporters;
 /* [ Cron ] */
 /* many lines, one per key: "map_key = aa_first,bb_first(bb_second),cc_first" */
 map_cron_t    g_settings_mapCron;
@@ -250,85 +244,6 @@ static int ParseCron()
     return 0; /* no error */
 }
 
-static set_string_t ParseKey(const char *Key, int *err)
-{
-    unsigned int ii;
-    std::string item;
-    std::string key;
-    set_string_t set;
-    bool is_quote = false;
-    for (ii = 0; Key[ii]; ii++)
-    {
-        if (Key[ii] == '\"')
-        {
-            is_quote = !is_quote;
-        }
-        else if (Key[ii] == ':' && !is_quote)
-        {
-            key = item;
-            item = "";
-        }
-        else if (isspace(Key[ii]) && !is_quote)
-        {
-            continue;
-        }
-        else if ((Key[ii] == ',') && !is_quote)
-        {
-            if (!key.empty())
-            {
-                set.insert(key + ":" + item);
-                item = "";
-            }
-            else
-            {
-                *err = 1;
-                error_msg("Parser error: Invalid syntax on column %d in \"%s\"", ii, Key);
-            }
-        }
-        else
-        {
-            item += Key[ii];
-        }
-    }
-    if (is_quote)
-    {
-        *err = 1;
-        error_msg("Parser error: Unclosed quote in \"%s\"", Key);
-    }
-    else if (item != "")
-    {
-        if (key == "")
-        {
-            set.insert(item);
-        }
-        else
-        {
-            set.insert(key + ":" + item);
-        }
-    }
-    return set;
-}
-
-static int ParseAnalyzerActionsAndReporters()
-{
-    map_string_t::iterator it = s_mapSectionAnalyzerActionsAndReporters.begin();
-    for (; it != s_mapSectionAnalyzerActionsAndReporters.end(); it++)
-    {
-        int err = 0;
-        set_string_t keys = ParseKey(it->first.c_str(), &err);
-        vector_pair_string_string_t actionsAndReporters = ParseListWithArgs(it->second.c_str(), &err);
-        if (err)
-            return err;
-        set_string_t::iterator it_keys = keys.begin();
-        for (; it_keys != keys.end(); it_keys++)
-        {
-            VERB2 log("AnalyzerActionsAndReporters['%s']=...", it_keys->c_str());
-            g_settings_mapAnalyzerActionsAndReporters[*it_keys] = actionsAndReporters;
-        }
-    }
-    return 0; /* no error */
-}
-
 static void LoadGPGKeys()
 {
     FILE *fp = fopen(CONF_DIR"/gpg_keys", "r");
@@ -449,12 +364,6 @@ static int ReadConfigurationFromFile(FILE *fp)
                 s_mapSectionCommon[key] += ",";
             s_mapSectionCommon[key] += value;
         }
-        else if (section == SECTION_ANALYZER_ACTIONS_AND_REPORTERS)
-        {
-            if (s_mapSectionAnalyzerActionsAndReporters[key] != "")
-                s_mapSectionAnalyzerActionsAndReporters[key] += ",";
-            s_mapSectionAnalyzerActionsAndReporters[key] += value;
-        }
         else if (section == SECTION_CRON)
         {
             if (s_mapSectionCron[key] != "")
@@ -492,8 +401,6 @@ int LoadSettings()
     if (err == 0)
         err = ParseCommon();
     if (err == 0)
-        err = ParseAnalyzerActionsAndReporters();
-    if (err == 0)
         err = ParseCron();
 
     if (err == 0)
@@ -517,7 +424,6 @@ map_abrt_settings_t GetSettings()
     map_abrt_settings_t ABRTSettings;
 
     ABRTSettings[SECTION_COMMON] = s_mapSectionCommon;
-    ABRTSettings[SECTION_ANALYZER_ACTIONS_AND_REPORTERS] = s_mapSectionAnalyzerActionsAndReporters;
     ABRTSettings[SECTION_CRON] = s_mapSectionCron;
 
     return ABRTSettings;
@@ -544,12 +450,6 @@ void SetSettings(const map_abrt_settings_t& pSettings, const char *dbus_sender)
         s_mapSectionCommon = it->second;
         ParseCommon();
     }
-    it = pSettings.find(SECTION_ANALYZER_ACTIONS_AND_REPORTERS);
-    if (it != end)
-    {
-        s_mapSectionAnalyzerActionsAndReporters = it->second;
-        ParseAnalyzerActionsAndReporters();
-    }
     it = pSettings.find(SECTION_CRON);
     if (it != end)
     {
diff --git a/src/daemon/Settings.h b/src/daemon/Settings.h
index 21cb8d0c..7fe64fcf 100644
--- a/src/daemon/Settings.h
+++ b/src/daemon/Settings.h
@@ -22,7 +22,6 @@
 #include "abrt_types.h"
 #include <glib.h>
 
-typedef map_vector_pair_string_string_t map_analyzer_actions_and_reporters_t;
 typedef map_vector_pair_string_string_t map_cron_t;
 typedef map_map_string_t map_abrt_settings_t;
 
@@ -35,7 +34,6 @@ extern bool          g_settings_bProcessUnpackaged;
 extern char *g_settings_sDatabase;
 extern char *g_settings_sWatchCrashdumpArchiveDir;
 extern map_cron_t    g_settings_mapCron;
-extern map_analyzer_actions_and_reporters_t g_settings_mapAnalyzerActionsAndReporters;
 
 int LoadSettings();
 void SaveSettings();
diff --git a/src/hooks/abrt-hook-ccpp.c b/src/hooks/abrt-hook-ccpp.c
index e4d1fc5a..dbf0c059 100644
--- a/src/hooks/abrt-hook-ccpp.c
+++ b/src/hooks/abrt-hook-ccpp.c
@@ -452,7 +452,6 @@ int main(int argc, char** argv)
         {
             int sv_errno = errno;
             dd_delete(dd);
-            dd_close(dd);
             if (user_core_fd >= 0)
             {
                 xchdir(user_pwd);
@@ -481,7 +480,6 @@ int main(int argc, char** argv)
         {
             unlink(path);
             dd_delete(dd);
-            dd_close(dd);
             if (user_core_fd >= 0)
             {
                 xchdir(user_pwd);
diff --git a/src/include/dump_dir.h b/src/include/dump_dir.h
index aeaa3180..fc882185 100644
--- a/src/include/dump_dir.h
+++ b/src/include/dump_dir.h
@@ -50,10 +50,10 @@ enum {
     /* DD_FAIL_QUIETLY bit is valid for dd_load_text_ext too, */
     DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE = (1 << 1),
 };
-char* dd_load_text_ext(const struct dump_dir *dd, const char* name, unsigned flags);
-char* dd_load_text(const struct dump_dir *dd, const char* name);
+char* dd_load_text_ext(const struct dump_dir *dd, const char *name, unsigned flags);
+char* dd_load_text(const struct dump_dir *dd, const char *name);
 void dd_save_text(struct dump_dir *dd, const char *name, const char *data);
-void dd_save_binary(struct dump_dir* dd, const char* name, const char* data, unsigned size);
+void dd_save_binary(struct dump_dir *dd, const char *name, const char *data, unsigned size);
 void dd_delete(struct dump_dir *dd);
 
 void delete_debug_dump_dir(const char *dd_dir);
diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
index 0328bb26..3778aa85 100644
--- a/src/lib/dump_dir.c
+++ b/src/lib/dump_dir.c
@@ -364,6 +364,7 @@ static void delete_file_dir(const char *dir)
 void dd_delete(struct dump_dir *dd)
 {
     delete_file_dir(dd->dd_dir);
+    dd_close(dd);
 }
 
 static char *load_text_file(const char *path, unsigned flags)
@@ -499,6 +500,5 @@ void delete_debug_dump_dir(const char *dd_dir)
     if (dd)
     {
         dd_delete(dd);
-        dd_close(dd);
     }
 }