From b07c8d78cbad077ea0596b90b370e2db0fe8b577 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 10 Dec 2009 13:55:24 +0100
Subject: make "abrt-cli --delete randomuuid" report that deletion failed.
 closes bug 59

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 src/Daemon/CommLayerServerDBus.cpp | 32 +++++++++++++++++++-------------
 src/Daemon/CrashWatcher.cpp        |  6 +++++-
 src/Daemon/CrashWatcher.h          |  2 +-
 3 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'src/Daemon')

diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index 7c2d4657..9222c594 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -135,9 +135,9 @@ static int handle_GetCrashInfos(DBusMessage* call, DBusMessage* reply)
     long unix_uid = get_remote_uid(call);
     vector_crash_infos_t argout1 = GetCrashInfos(to_string(unix_uid).c_str());
 
-    DBusMessageIter iter;
-    dbus_message_iter_init_append(reply, &iter);
-    store_val(&iter, argout1);
+    DBusMessageIter out_iter;
+    dbus_message_iter_init_append(reply, &out_iter);
+    store_val(&out_iter, argout1);
 
     send_flush_and_unref(reply);
     return 0;
@@ -313,7 +313,11 @@ static int handle_DeleteDebugDump(DBusMessage* call, DBusMessage* reply)
     }
 
     long unix_uid = get_remote_uid(call);
-    DeleteDebugDump(argin1, to_string(unix_uid).c_str());
+    int32_t result = DeleteDebugDump(argin1, to_string(unix_uid).c_str());
+
+    DBusMessageIter out_iter;
+    dbus_message_iter_init_append(reply, &out_iter);
+    store_val(&out_iter, result);
 
     send_flush_and_unref(reply);
     return 0;
@@ -323,9 +327,9 @@ static int handle_GetPluginsInfo(DBusMessage* call, DBusMessage* reply)
 {
     vector_map_string_t plugins_info = g_pPluginManager->GetPluginsInfo();
 
-    DBusMessageIter iter;
-    dbus_message_iter_init_append(reply, &iter);
-    store_val(&iter, plugins_info);
+    DBusMessageIter out_iter;
+    dbus_message_iter_init_append(reply, &out_iter);
+    store_val(&out_iter, plugins_info);
 
     send_flush_and_unref(reply);
     return 0;
@@ -348,9 +352,10 @@ static int handle_GetPluginSettings(DBusMessage* call, DBusMessage* reply)
     VERB1 log("got %s('%s') call from uid %ld", "GetPluginSettings", PluginName, unix_uid);
     map_plugin_settings_t plugin_settings = g_pPluginManager->GetPluginSettings(PluginName, to_string(unix_uid).c_str());
 
-    DBusMessageIter iter;
-    dbus_message_iter_init_append(reply, &iter);
-    store_val(&iter, plugin_settings);
+    DBusMessageIter out_iter;
+    dbus_message_iter_init_append(reply, &out_iter);
+    store_val(&out_iter, plugin_settings);
+
     send_flush_and_unref(reply);
     return 0;
 }
@@ -432,9 +437,10 @@ static int handle_GetSettings(DBusMessage* call, DBusMessage* reply)
 {
     map_abrt_settings_t result = GetSettings();
 
-    DBusMessageIter iter;
-    dbus_message_iter_init_append(reply, &iter);
-    store_val(&iter, result);
+    DBusMessageIter out_iter;
+    dbus_message_iter_init_append(reply, &out_iter);
+    store_val(&out_iter, result);
+
     send_flush_and_unref(reply);
     return 0;
 }
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 3684d600..88c058b0 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -193,7 +193,7 @@ int CreateReportThread(const char* pUUID, const char* pUID, int force, const cha
 
 
 /* Remove dump dir and its DB record */
-void DeleteDebugDump(const char *pUUID, const char *pUID)
+int DeleteDebugDump(const char *pUUID, const char *pUID)
 {
     try
     {
@@ -205,12 +205,16 @@ void DeleteDebugDump(const char *pUUID, const char *pUID)
 
         const char *dump_dir = row.m_sDebugDumpDir.c_str();
         if (dump_dir[0] != '\0')
+        {
             delete_debug_dump_dir(dump_dir);
+            return 0; /* success */
+        }
     }
     catch (CABRTException& e)
     {
         error_msg("%s", e.what());
     }
+    return -1; /* failure */
 }
 
 void DeleteDebugDump_by_dir(const char *dump_dir)
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index a8064367..8d56c4ec 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -51,7 +51,7 @@ class CCrashWatcher
 vector_crash_infos_t GetCrashInfos(const char *pUID);
 int CreateReportThread(const char* pUUID, const char* pUID, int force, const char* pSender);
 map_crash_report_t CreateReport(const char* pUUID, const char* pUID, int force);
-void DeleteDebugDump(const char *pUUID, const char *pUID);
+int DeleteDebugDump(const char *pUUID, const char *pUID);
 void DeleteDebugDump_by_dir(const char *dump_dir);
 
 #endif
-- 
cgit