*: rename *crash_dump.* -> *crash_data.*

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

25 files changed, 30 insertions, 30 deletions

diff --git a/src/applet/test_report.c b/src/applet/test_report.c
index e7aac40c..2b3da020 100644
--- a/src/applet/test_report.c
+++ b/src/applet/test_report.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "crash_dump.h"
+#include "crash_data.h"
 #include "dump_dir.h"
 #include "run_event.h"
 
diff --git a/src/cli/dbus.h b/src/cli/dbus.h
index 0d338d27..62ce6fca 100644
--- a/src/cli/dbus.h
+++ b/src/cli/dbus.h
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include "abrt_dbus.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 extern DBusConnection* s_dbus_conn;
 
diff --git a/src/daemon/CommLayerServer.h b/src/daemon/CommLayerServer.h
index 5b7ecf57..997f6c41 100644
--- a/src/daemon/CommLayerServer.h
+++ b/src/daemon/CommLayerServer.h
@@ -20,7 +20,7 @@
 #define COMMLAYERSERVER_H_
 
 #include "abrtlib.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 class CCommLayerServer {
     public:
diff --git a/src/daemon/Daemon.h b/src/daemon/Daemon.h
index 158b48fb..0c3db566 100644
--- a/src/daemon/Daemon.h
+++ b/src/daemon/Daemon.h
@@ -21,7 +21,7 @@
 
 #include <pthread.h>
 #include "abrt_types.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 class CCrashWatcher;
 class CCommLayerServer;
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 724b092a..655bda3a 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -300,8 +300,8 @@ report_status_t Report(crash_data_t *client_report,
     }
 
     VERB3 {
-        log_map_crash_data(client_report, " client_report");
-        log_map_crash_data(stored_report, " stored_report");
+        log_crash_data(client_report, " client_report");
+        log_crash_data(stored_report, " stored_report");
     }
     free_crash_data(stored_report);
 #define stored_report stored_report_must_not_be_used_below
@@ -687,7 +687,7 @@ void CreateReport(const char* crash_id, long caller_uid, int force, crash_data_t
     switch (res)
     {
         case MW_OK:
-            VERB2 log_map_crash_data(*crash_data, "crashReport");
+            VERB2 log_crash_data(*crash_data, "crashReport");
             break;
         case MW_NOENT_ERROR:
             error_msg("Can't find crash with id '%s'", crash_id);
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
index fdf66e59..47457aaf 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 "abrt_crash_dump.h" /* FILENAME_foo */
+#include "abrt_crash_data.h" /* FILENAME_foo */
 #include "hooklib.h"
 #include "parse_options.h"
 
diff --git a/src/gui/CCDump.py b/src/gui/CCDump.py
index df5c18aa..85d8b3ed 100644
--- a/src/gui/CCDump.py
+++ b/src/gui/CCDump.py
@@ -3,7 +3,7 @@ from datetime import datetime
 
 from abrt_utils import _, init_logging, log, log1, log2
 
-# Keep in sync with [abrt_]crash_dump.h!
+# Keep in sync with [abrt_]crash_data.h!
 CD_TYPE     = 0
 CD_EDITABLE = 1
 CD_CONTENT  = 2
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 165c705b..b5d604ef 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,6 +1,6 @@
 libreport_includedir = $(includedir)/report
 libreport_include_HEADERS = \
-    report/crash_dump.h \
+    report/crash_data.h \
     report/dump_dir.h \
     report/run_event.h
 
@@ -9,7 +9,7 @@ libabrt_include_HEADERS = \
     abrtlib.h \
     abrt_types.h \
     comm_layer_inner.h \
-    abrt_crash_dump.h \
+    abrt_crash_data.h \
     dbus_common.h \
     observer.h \
     plugin.h \
diff --git a/src/include/abrt_crash_dump.h b/src/include/abrt_crash_data.h
index 9ecbf56d..b3278858 100644
--- a/src/include/abrt_crash_dump.h
+++ b/src/include/abrt_crash_data.h
@@ -19,7 +19,7 @@
 #ifndef ABRT_CRASH_DUMP_H_
 #define ABRT_CRASH_DUMP_H_
 
-#include "crash_dump.h"
+#include "crash_data.h"
 #include "abrt_types.h"
 
 // Text bigger than this usually is attached, not added inline
@@ -78,8 +78,8 @@ extern "C" {
 #define is_editable_file abrt_is_editable_file
 bool is_editable_file(const char *file_name);
 
-#define log_map_crash_data abrt_log_map_crash_data
-void log_map_crash_data(crash_data_t *crash_data, const char *pfx);
+#define log_crash_data abrt_log_crash_data
+void log_crash_data(crash_data_t *crash_data, const char *pfx);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index d3f355e9..0eb0f2d0 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -77,7 +77,7 @@ int vdprintf(int d, const char *format, va_list ap);
 #include "hash_sha1.h"
 #include "hash_md5.h"
 
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 #include "abrt_types.h"
 #include "dump_dir.h"
 #include "run_event.h"
diff --git a/src/include/dbus_common.h b/src/include/dbus_common.h
index 6c739169..4e980d34 100644
--- a/src/include/dbus_common.h
+++ b/src/include/dbus_common.h
@@ -19,7 +19,7 @@
 #ifndef DBUSCOMMON_H_
 #define DBUSCOMMON_H_
 
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define ABRTD_DBUS_NAME "com.redhat.abrt"
 #define ABRTD_DBUS_PATH "/com/redhat/abrt"
diff --git a/src/include/plugin.h b/src/include/plugin.h
index 322c212f..e3f1f81f 100644
--- a/src/include/plugin.h
+++ b/src/include/plugin.h
@@ -23,7 +23,7 @@
 #define PLUGIN_H_
 
 #include "abrt_types.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define PLUGINS_MAGIC_NUMBER 6
 
diff --git a/src/include/report/crash_dump.h b/src/include/report/crash_data.h
index 86cdadd0..86cdadd0 100644
--- a/src/include/report/crash_dump.h
+++ b/src/include/report/crash_data.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 13029360..b02acb82 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -35,7 +35,7 @@ libreport_la_SOURCES = \
     load_plugin_settings.c \
     make_descr.c \
     run_event.c \
-    crash_dump.c \
+    crash_data.c \
     create_dump_dir.c \
     abrt_types.c \
     hooklib.c hooklib.h \
diff --git a/src/lib/crash_dump.c b/src/lib/crash_data.c
index 189ec9cf..b3c36ec7 100644
--- a/src/lib/crash_dump.c
+++ b/src/lib/crash_data.c
@@ -17,7 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "abrtlib.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 static void free_crash_item(void *ptr)
 {
@@ -229,7 +229,7 @@ crash_data_t *load_crash_data_from_dump_dir(struct dump_dir *dd)
     return crash_data;
 }
 
-void log_map_crash_data(crash_data_t *crash_data, const char *pfx)
+void log_crash_data(crash_data_t *crash_data, const char *pfx)
 {
     GHashTableIter iter;
     char *name;
diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
index 8e1744a2..a952d5b6 100644
--- a/src/lib/dump_dir.c
+++ b/src/lib/dump_dir.c
@@ -205,7 +205,7 @@ struct dump_dir *dd_opendir(const char *dir, int flags)
      * defaults to "."! Let's require that at least some crash dump dir
      * specific files exist before we declare open successful:
      */
-    char *name = concat_path_file(dir, FILENAME_ANALYZER);
+    char *name = concat_path_file(dir, FILENAME_UID);
     int bad = (lstat(name, &stat_buf) != 0 || !S_ISREG(stat_buf.st_mode));
     free(name);
     if (bad)
diff --git a/src/lib/make_descr.c b/src/lib/make_descr.c
index e4d678c5..ed0b99a2 100644
--- a/src/lib/make_descr.c
+++ b/src/lib/make_descr.c
@@ -17,7 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "abrtlib.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 // caller is responsible for freeing **dsc
 static void add_content(bool *was_multiline, char **dsc, const char *header, const char *content)
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp
index 19acc4fe..9174dbc3 100644
--- a/src/plugins/abrt-action-bugzilla.cpp
+++ b/src/plugins/abrt-action-bugzilla.cpp
@@ -18,7 +18,7 @@
 */
 #include "abrtlib.h"
 #include "abrt_xmlrpc.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define XML_RPC_SUFFIX      "/xmlrpc.cgi"
 #define MAX_HOPS            5
diff --git a/src/plugins/abrt-action-kerneloops.c b/src/plugins/abrt-action-kerneloops.c
index ee4dce2f..9cffab7d 100644
--- a/src/plugins/abrt-action-kerneloops.c
+++ b/src/plugins/abrt-action-kerneloops.c
@@ -19,7 +19,7 @@
 
 #include <curl/curl.h>
 #include "abrtlib.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define PROGNAME "abrt-action-kerneloops"
 
diff --git a/src/plugins/abrt-action-mailx.c b/src/plugins/abrt-action-mailx.c
index 4812e64f..6ade162e 100644
--- a/src/plugins/abrt-action-mailx.c
+++ b/src/plugins/abrt-action-mailx.c
@@ -21,7 +21,7 @@
 
 #include "abrtlib.h"
 #include "parse_options.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define PROGNAME "abrt-action-mailx"
 
diff --git a/src/plugins/abrt-action-print.c b/src/plugins/abrt-action-print.c
index 4c28d3f3..3e420768 100644
--- a/src/plugins/abrt-action-print.c
+++ b/src/plugins/abrt-action-print.c
@@ -20,7 +20,7 @@
 */
 #include "abrtlib.h"
 #include "parse_options.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define PROGNAME "abrt-action-print"
 
diff --git a/src/plugins/abrt-action-rhtsupport.c b/src/plugins/abrt-action-rhtsupport.c
index 7e950b0a..77b6b1ff 100644
--- a/src/plugins/abrt-action-rhtsupport.c
+++ b/src/plugins/abrt-action-rhtsupport.c
@@ -22,7 +22,7 @@
 #include "abrt_curl.h"
 #include "abrt_xmlrpc.h"
 #include "abrt_rh_support.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define PROGNAME "abrt-action-rhtsupport"
 
diff --git a/src/plugins/abrt-action-upload.c b/src/plugins/abrt-action-upload.c
index 8789f0e7..4bc5a458 100644
--- a/src/plugins/abrt-action-upload.c
+++ b/src/plugins/abrt-action-upload.c
@@ -21,7 +21,7 @@
 #include <curl/curl.h>
 #include "abrtlib.h"
 #include "parse_options.h"
-#include "abrt_crash_dump.h"
+#include "abrt_crash_data.h"
 
 #define PROGNAME "abrt-action-upload"
 
diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am
index c92bbaa6..a00e2d7b 100644
--- a/src/report-python/Makefile.am
+++ b/src/report-python/Makefile.am
@@ -8,7 +8,7 @@ pyreportexec_LTLIBRARIES = _pyreport.la
 
 _pyreport_la_SOURCES = \
     reportmodule.c \
-    crash_dump.c \
+    crash_data.c \
     dump_dir.c \
     run_event.c \
     common.h
diff --git a/src/report-python/crash_dump.c b/src/report-python/crash_data.c
index e6ab966c..8ae597c3 100644
--- a/src/report-python/crash_dump.c
+++ b/src/report-python/crash_data.c
@@ -20,7 +20,7 @@
 #include <structmember.h>
 
 #include <errno.h>
-#include "crash_dump.h"
+#include "crash_data.h"
 #include "dump_dir.h"
 #include "common.h"