Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

1 files changed, 6 insertions, 7 deletions

diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 59f9e65..80d8cd4 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -45,9 +45,9 @@ CCrashWatcher::~CCrashWatcher()
 {
 }
 
-vector_crash_infos_t GetCrashInfos(const char *pUID)
+vector_map_crash_data_t GetCrashInfos(const char *pUID)
 {
-    vector_crash_infos_t retval;
+    vector_map_crash_data_t retval;
     log("Getting crash infos...");
     try
     {
@@ -58,7 +58,7 @@ vector_crash_infos_t GetCrashInfos(const char *pUID)
         for (ii = 0; ii < UUIDsUIDs.size(); ii++)
         {
             mw_result_t res;
-            map_crash_info_t info;
+            map_crash_data_t info;
             const char *uuid = UUIDsUIDs[ii].first.c_str();
             const char *uid = UUIDsUIDs[ii].second.c_str();
 
@@ -96,15 +96,14 @@ vector_crash_infos_t GetCrashInfos(const char *pUID)
  * StartJob dbus call already did all the processing, and we just retrieve
  * the result from dump directory, which is fast.
  */
-map_crash_report_t CreateReport(const char* pUUID, const char* pUID, int force)
+map_crash_data_t CreateReport(const char* pUUID, const char* pUID, int force)
 {
-    map_crash_info_t crashReport;
-
     /* FIXME: starting from here, any shared data must be protected with a mutex.
      * For example, CreateCrashReport does:
      * g_pPluginManager->GetDatabase(g_settings_sDatabase.c_str());
      * which is unsafe wrt concurrent updates to g_pPluginManager state.
      */
+    map_crash_data_t crashReport;
     mw_result_t res = CreateCrashReport(pUUID, pUID, force, crashReport);
     switch (res)
     {
@@ -141,7 +140,7 @@ static void* create_report(void* arg)
     try
     {
         log("Creating report...");
-        map_crash_info_t crashReport = CreateReport(thread_data->UUID, thread_data->UID, thread_data->force);
+        map_crash_data_t crashReport = CreateReport(thread_data->UUID, thread_data->UID, thread_data->force);
         g_pCommLayer->JobDone(thread_data->peer, thread_data->UUID);
     }
     catch (CABRTException& e)