move all FILENAME_xxx defines to inc/CrashTypes.h

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

4 files changed, 16 insertions, 16 deletions

diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp
index eca2d41..11037ca 100644
--- a/src/CLI/report.cpp
+++ b/src/CLI/report.cpp
@@ -19,7 +19,8 @@
 #include "run-command.h"
 #include "dbus.h"
 #include "abrtlib.h"
-#include "DebugDump.h" // FILENAME_* defines
+#include "DebugDump.h"
+#include "CrashTypes.h" // FILENAME_* defines
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -195,13 +196,13 @@ static void write_crash_report(const map_crash_data_t &report, FILE *fp)
 			   _("# Describe the circumstances of this crash below."));
   write_crash_report_field(fp, report, CD_REPRODUCE,
 			   _("# How to reproduce the crash?"));
-  write_crash_report_field(fp, report, "backtrace",
+  write_crash_report_field(fp, report, FILENAME_BACKTRACE,
 			   _("# Stack trace: a list of active stack frames at the time the crash occurred\n# Check that it does not contain any sensitive data such as passwords."));
   write_crash_report_field(fp, report, CD_UUID, _("# UUID"));
   write_crash_report_field(fp, report, FILENAME_ARCHITECTURE, _("# Architecture"));
-  write_crash_report_field(fp, report, "cmdline", _("# Command line"));
+  write_crash_report_field(fp, report, FILENAME_CMDLINE, _("# Command line"));
   write_crash_report_field(fp, report, FILENAME_COMPONENT, _("# Component"));
-  write_crash_report_field(fp, report, "coredump", _("# Core dump"));
+  write_crash_report_field(fp, report, FILENAME_COREDUMP, _("# Core dump"));
   write_crash_report_field(fp, report, FILENAME_EXECUTABLE, _("# Executable"));
   write_crash_report_field(fp, report, FILENAME_KERNEL, _("# Kernel version"));
   write_crash_report_field(fp, report, FILENAME_PACKAGE, _("# Package"));
@@ -283,12 +284,12 @@ static int read_crash_report(map_crash_data_t &report, const char *text)
   int result = 0;
   result |= read_crash_report_field(text, report, CD_COMMENT);
   result |= read_crash_report_field(text, report, CD_REPRODUCE);
-  result |= read_crash_report_field(text, report, "backtrace");
+  result |= read_crash_report_field(text, report, FILENAME_BACKTRACE);
   result |= read_crash_report_field(text, report, CD_UUID);
   result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE);
-  result |= read_crash_report_field(text, report, "cmdline");
+  result |= read_crash_report_field(text, report, FILENAME_CMDLINE);
   result |= read_crash_report_field(text, report, FILENAME_COMPONENT);
-  result |= read_crash_report_field(text, report, "coredump");
+  result |= read_crash_report_field(text, report, FILENAME_COREDUMP);
   result |= read_crash_report_field(text, report, FILENAME_EXECUTABLE);
   result |= read_crash_report_field(text, report, FILENAME_KERNEL);
   result |= read_crash_report_field(text, report, FILENAME_PACKAGE);
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index af52b85..50d0aca 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -85,8 +85,8 @@ static char* is_text_file(const char *name, ssize_t *sz)
     }
 
     /* Some files in our dump directories are known to always be textual */
-    if (strcmp(name, "backtrace") == 0
-     || strcmp(name, "cmdline") == 0
+    if (strcmp(name, FILENAME_BACKTRACE) == 0
+     || strcmp(name, FILENAME_CMDLINE) == 0
     ) {
         return buf;
     }
diff --git a/src/Hooks/abrt-hook-ccpp.cpp b/src/Hooks/abrt-hook-ccpp.cpp
index 1c91dc8..b844be7 100644
--- a/src/Hooks/abrt-hook-ccpp.cpp
+++ b/src/Hooks/abrt-hook-ccpp.cpp
@@ -21,12 +21,10 @@
 #include "abrtlib.h"
 #include "hooklib.h"
 #include "DebugDump.h"
+#include "CrashTypes.h"
 #include "ABRTException.h"
 #include <syslog.h>
 
-#define FILENAME_EXECUTABLE     "executable"
-#define FILENAME_COREDUMP       "coredump"
-
 using namespace std;
 
 static char* malloc_readlink(const char *linkname)
diff --git a/src/Hooks/abrt-hook-python.cpp b/src/Hooks/abrt-hook-python.cpp
index c8a25e3..90197cc 100644
--- a/src/Hooks/abrt-hook-python.cpp
+++ b/src/Hooks/abrt-hook-python.cpp
@@ -26,6 +26,7 @@
 #include "abrtlib.h"
 #include "hooklib.h"
 #include "DebugDump.h"
+#include "CrashTypes.h"
 #include "ABRTException.h"
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -149,14 +150,14 @@ int main(int argc, char** argv)
 
   dd.SaveText(FILENAME_ANALYZER, "Python");
   dd.SaveText(FILENAME_EXECUTABLE, executable);
-  dd.SaveText("backtrace", bt);
+  dd.SaveText(FILENAME_BACKTRACE, bt);
   free(bt);
-  dd.SaveText("cmdline", cmdline);
+  dd.SaveText(FILENAME_CMDLINE, cmdline);
   free(cmdline);
-  dd.SaveText("uuid", uuid);
+  dd.SaveText(FILENAME_UUID, uuid);
   char uid[sizeof(long) * 3 + 2];
   sprintf(uid, "%lu", (long)getuid());
-  dd.SaveText("uid", uid);
+  dd.SaveText(FILENAME_UID, uid);
 
   dd.Close();
   log("saved python crash dump of pid %s to %s", pid, path);