Rename foo_crash_dump_dir -> foo_dump_dir

To be exact, these three functions are renamed:

load_crash_data_from_crash_dump_dir
create_crash_dump_dir
delete_crash_dump_dir

Rationale: data structure is called "struct dump_dir", not
"struct crash_dump_dir"

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

2 files changed, 7 insertions, 7 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index f98d8741..a181da15 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -535,7 +535,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_crash_dump_dir(d);
+                delete_dump_dir(d);
                 free(d);
             }
         }
@@ -558,7 +558,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_crash_dump_dir(fullname);
+                    delete_dump_dir(fullname);
                 }
 
                 const char *uid_str = get_crash_item_content_or_NULL(crash_data, FILENAME_UID);
@@ -583,7 +583,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_crash_dump_dir(fullname);
+                delete_dump_dir(fullname);
                 break;
         }
         free(fullname);
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 51f7929d..724b092a 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -79,7 +79,7 @@ static crash_data_t *DebugDumpToCrashReport(const char *dump_dir_name)
         v++;
     }
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
@@ -162,7 +162,7 @@ static mw_result_t CreateCrashReport(const char *dump_dir_name,
         goto ret;
     }
 
-    /* Do a load_crash_data_from_crash_dump_dir from (possibly updated)
+    /* Do a load_crash_data_from_dump_dir from (possibly updated)
      * crash dump dir
      */
     *crash_data = DebugDumpToCrashReport(dump_dir_name);
@@ -590,7 +590,7 @@ static crash_data_t *FillCrashInfo(const char *dump_dir_name)
     if (!dd)
         return NULL;
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
@@ -656,7 +656,7 @@ vector_of_crash_data_t *GetCrashInfos(long caller_uid)
                 if (!crash_data)
                 {
                     error_msg("Dump directory %s doesn't exist or misses crucial files, deleting", dump_dir_name);
-                    delete_crash_dump_dir(dump_dir_name);
+                    delete_dump_dir(dump_dir_name);
                 }
                 else
                 {