preparatory patch for future factoring out of headers for reportlib

Some files and functions are renamed, no logic changes.

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

5 files changed, 10 insertions, 10 deletions

diff --git a/src/daemon/CommLayerServer.h b/src/daemon/CommLayerServer.h
index 6eb8b464..5b7ecf57 100644
--- a/src/daemon/CommLayerServer.h
+++ b/src/daemon/CommLayerServer.h
@@ -20,7 +20,7 @@
 #define COMMLAYERSERVER_H_
 
 #include "abrtlib.h"
-#include "crash_types.h"
+#include "abrt_crash_dump.h"
 
 class CCommLayerServer {
     public:
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index f0f9dee8..609b0b26 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -536,7 +536,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
                 char *d = concat_path_file(DEBUG_DUMPS_DIR, worst_dir);
                 free(worst_dir);
                 worst_dir = NULL;
-                delete_debug_dump_dir(d);
+                delete_crash_dump_dir(d);
                 free(d);
             }
         }
@@ -561,7 +561,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
                         log("Deleting crash %s (dup of %s), sending dbus signal",
                                 strrchr(fullname, '/') + 1,
                                 strrchr(first, '/') + 1);
-                        delete_debug_dump_dir(fullname);
+                        delete_crash_dump_dir(fullname);
                     }
 
                     const char *uid_str = get_crash_data_item_content_or_NULL(crashinfo, FILENAME_UID);
@@ -586,7 +586,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
                 case MW_GPG_ERROR:
                 default:
                     log("Corrupted or bad crash %s (res:%d), deleting", fullname, (int)res);
-                    delete_debug_dump_dir(fullname);
+                    delete_crash_dump_dir(fullname);
                     break;
             }
         }
diff --git a/src/daemon/Daemon.h b/src/daemon/Daemon.h
index 62088651..158b48fb 100644
--- a/src/daemon/Daemon.h
+++ b/src/daemon/Daemon.h
@@ -21,7 +21,7 @@
 
 #include <pthread.h>
 #include "abrt_types.h"
-#include "crash_types.h"
+#include "abrt_crash_dump.h"
 
 class CCrashWatcher;
 class CCommLayerServer;
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 27fd8fcf..ee2853b2 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -72,7 +72,7 @@ static bool DebugDumpToCrashReport(const char *dump_dir_name, map_crash_data_t&
         v++;
     }
 
-    load_crash_data_from_debug_dump(dd, pCrashData);
+    load_crash_data_from_crash_dump_dir(dd, pCrashData);
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
@@ -143,7 +143,7 @@ mw_result_t CreateCrashReport(const char *dump_dir_name,
             goto ret;
         }
 
-        /* Do a load_crash_data_from_debug_dump from (possibly updated)
+        /* Do a load_crash_data_from_crash_dump_dir from (possibly updated)
          * crash dump dir
          */
         if (!DebugDumpToCrashReport(dump_dir_name, pCrashData))
@@ -575,7 +575,7 @@ static mw_result_t FillCrashInfo(const char *dump_dir_name,
     if (!dd)
         return MW_ERROR;
 
-    load_crash_data_from_debug_dump(dd, pCrashData);
+    load_crash_data_from_crash_dump_dir(dd, pCrashData);
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
@@ -648,7 +648,7 @@ vector_map_crash_data_t GetCrashInfos(long caller_uid)
                             break;
                         case MW_ERROR:
                             error_msg("Dump directory %s doesn't exist or misses crucial files, deleting", dump_dir_name);
-                            delete_debug_dump_dir(dump_dir_name);
+                            delete_crash_dump_dir(dump_dir_name);
                             break;
                         default:
                             break;
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
index db07fe94..fdf66e59 100644
--- a/src/daemon/abrt-server.c
+++ b/src/daemon/abrt-server.c
@@ -17,7 +17,7 @@
 */
 #include "abrtlib.h"
 #include "dump_dir.h"
-#include "crash_types.h" /* FILENAME_foo */
+#include "abrt_crash_dump.h" /* FILENAME_foo */
 #include "hooklib.h"
 #include "parse_options.h"