From b73a86c04c9469d2e8bae7225575d1e785d0852f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 4 Dec 2009 17:19:18 +0100 Subject: small fix on top of DeleteDebugDump change Signed-off-by: Denys Vlasenko --- src/Daemon/CrashWatcher.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Daemon/CrashWatcher.cpp') diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 1606f86..2973cfc 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -201,7 +201,9 @@ void DeleteDebugDump(const char *pUUID, const char *pUID) database->DeleteRow(pUUID, pUID); database->DisConnect(); - delete_debug_dump_dir(row.m_sDebugDumpDir.c_str()); + const char *dump_dir = row.m_sDebugDumpDir.c_str(); + if (dump_dir[0] != '\0') + delete_debug_dump_dir(dump_dir); } catch (CABRTException& e) { -- cgit From fb72ac689ca4832fca215edc942ae01592ecfff8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 7 Dec 2009 11:46:13 +0100 Subject: *: remove most of remaining const string& params Signed-off-by: Denys Vlasenko --- src/Daemon/CrashWatcher.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Daemon/CrashWatcher.cpp') diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 2973cfc..3684d60 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -73,6 +73,8 @@ vector_crash_infos_t GetCrashInfos(const char *pUID) /* Deletes both DB record and dump dir */ DeleteDebugDump(uuid, uid); break; + default: + break; } } } -- cgit From b07c8d78cbad077ea0596b90b370e2db0fe8b577 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko 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 --- src/Daemon/CrashWatcher.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Daemon/CrashWatcher.cpp') diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 3684d60..88c058b 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) -- cgit