move all FILENAME_xxx defines to inc/CrashTypes.h

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

14 files changed, 62 insertions, 72 deletions

diff --git a/inc/CrashTypes.h b/inc/CrashTypes.h
index 4778b707..9daefa93 100644
--- a/inc/CrashTypes.h
+++ b/inc/CrashTypes.h
@@ -21,22 +21,29 @@
 
 #include "abrt_types.h"
 
-// SYS - system value, should not be displayed
-// BIN - binary data
-// TXT - text data, can be displayed
-#define CD_SYS          "s"
-#define CD_BIN          "b"
-#define CD_TXT          "t"
-
-/* Text bigger than this usually is attached, not added inline */
-#define CD_TEXT_ATT_SIZE (2*1024)
-
-#define CD_ISEDITABLE       "y"
-#define CD_ISNOTEDITABLE    "n"
-
-#define CD_TYPE         (0)
-#define CD_EDITABLE     (1)
-#define CD_CONTENT      (2)
+// Filenames in dump directory
+#define FILENAME_ARCHITECTURE "architecture"
+#define FILENAME_KERNEL       "kernel"
+#define FILENAME_TIME         "time"
+#define FILENAME_UID          "uid"
+// uuid _file_ exists for Python analyzer only - remove, follow ccpp's example?
+// (ccpp keeps uuid in DB)
+#define FILENAME_UUID         "uuid"
+#define FILENAME_PACKAGE      "package"
+#define FILENAME_COMPONENT    "component"
+#define FILENAME_DESCRIPTION  "description"
+#define FILENAME_ANALYZER     "analyzer"
+#define FILENAME_RELEASE      "release"
+#define FILENAME_EXECUTABLE   "executable"
+#define FILENAME_REASON       "reason"
+#define FILENAME_COMMENT      "comment"
+#define FILENAME_REPRODUCE    "reproduce"
+#define FILENAME_RATING       "rating"
+#define FILENAME_CMDLINE      "cmdline"
+#define FILENAME_COREDUMP     "coredump"
+#define FILENAME_BACKTRACE    "backtrace"
+#define FILENAME_MEMORYMAP    "memorymap"
+#define FILENAME_KERNELOOPS   "kerneloops"
 
 #define CD_UUID         "UUID"
 #define CD_UID          "UID"
@@ -54,6 +61,23 @@
 #define CD_MWUUID       "_MWUUID"
 #define CD_MWDDD        "_MWDDD"
 
+// SYS - system value, should not be displayed
+// BIN - binary data
+// TXT - text data, can be displayed
+#define CD_SYS          "s"
+#define CD_BIN          "b"
+#define CD_TXT          "t"
+
+/* Text bigger than this usually is attached, not added inline */
+#define CD_TEXT_ATT_SIZE (2*1024)
+
+#define CD_ISEDITABLE       "y"
+#define CD_ISNOTEDITABLE    "n"
+
+#define CD_TYPE         (0)
+#define CD_EDITABLE     (1)
+#define CD_CONTENT      (2)
+
 // currently, vector always has exactly 3 elements -> <type, editable, content>
 // <key, data>
 typedef map_vector_string_t map_crash_data_t;
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index ab29fbbe..28e6bac3 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -40,10 +40,6 @@ using namespace std;
 #define CORE_PATTERN_IFACE      "/proc/sys/kernel/core_pattern"
 #define CORE_PATTERN            "|"CCPP_HOOK_PATH" "DEBUG_DUMPS_DIR" %p %s %u %c"
 
-#define FILENAME_COREDUMP       "coredump"
-#define FILENAME_BACKTRACE      "backtrace"
-#define FILENAME_MEMORYMAP      "memorymap"
-
 #define DEBUGINFO_CACHE_DIR     LOCALSTATEDIR"/cache/abrt-di"
 
 CAnalyzerCCpp::CAnalyzerCCpp() :
@@ -233,7 +229,7 @@ static int rate_backtrace(const char *backtrace)
         }
     }
 
-    /* Bogus "backtrace" with zero frames? */
+    /* Bogus 'backtrace' with zero frames? */
     if (best_possible_rating == 0)
         return 0;
 
diff --git a/lib/Plugins/Firefox.cpp b/lib/Plugins/Firefox.cpp
index d9807556..e8b12f56 100644
--- a/lib/Plugins/Firefox.cpp
+++ b/lib/Plugins/Firefox.cpp
@@ -36,10 +36,6 @@
 #define CORE_PATTERN_IFACE      "/proc/sys/kernel/core_pattern"
 #define CORE_PATTERN            "|"CCPP_HOOK_PATH" "DEBUG_DUMPS_DIR" %p %s %u"
 
-#define FILENAME_COREDUMP       "coredump"
-#define FILENAME_BACKTRACE      "backtrace"
-#define FILENAME_MEMORYMAP      "memorymap"
-
 #define DEBUGINFO_CACHE_DIR     LOCALSTATEDIR"/cache/abrt-di"
 
 CAnalyzerFirefox::CAnalyzerFirefox() :
@@ -227,7 +223,7 @@ static int rate_backtrace(const char *backtrace)
         }
     }
 
-    /* Bogus "backtrace" with zero frames? */
+    /* Bogus 'backtrace' with zero frames? */
     if (best_possible_rating == 0)
         return 0;
 
diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp
index 2e28cf4a..bcb7a723 100644
--- a/lib/Plugins/Kerneloops.cpp
+++ b/lib/Plugins/Kerneloops.cpp
@@ -30,8 +30,6 @@
 #include "ABRTException.h"
 #include "CommLayerInner.h"
 
-#define FILENAME_KERNELOOPS  "kerneloops"
-
 std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir)
 {
 	log(_("Getting local universal unique identification"));
diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp
index 7c488363..18932aea 100644
--- a/lib/Plugins/KerneloopsReporter.cpp
+++ b/lib/Plugins/KerneloopsReporter.cpp
@@ -30,8 +30,6 @@
 #include "CommLayerInner.h"
 #include "ABRTException.h"
 
-#define FILENAME_KERNELOOPS "kerneloops"
-
 /* helpers */
 static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
 {
diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp
index 1bb45aba..fe780a01 100644
--- a/lib/Plugins/KerneloopsScanner.cpp
+++ b/lib/Plugins/KerneloopsScanner.cpp
@@ -36,8 +36,6 @@
 
 #include <limits.h>
 
-#define FILENAME_KERNELOOPS  "kerneloops"
-
 // TODO: https://fedorahosted.org/abrt/ticket/78
 
 CKerneloopsScanner::CKerneloopsScanner()
diff --git a/lib/Plugins/Python.cpp b/lib/Plugins/Python.cpp
index 23d6f5c0..79247d65 100644
--- a/lib/Plugins/Python.cpp
+++ b/lib/Plugins/Python.cpp
@@ -1,15 +1,14 @@
+#include "abrtlib.h"
 #include "Python.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
 
-#define FILENAME_BACKTRACE      "backtrace"
-
 static std::string CreateHash(const char *pDebugDumpDir)
 {
 	std::string uuid;
 	CDebugDump dd;
 	dd.Open(pDebugDumpDir);
-	dd.LoadText("uuid", uuid);
+	dd.LoadText(FILENAME_UUID, uuid);
 	return uuid;
 }
 
diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp
index e2147e26..77f5d3c8 100644
--- a/lib/Plugins/RunApp.cpp
+++ b/lib/Plugins/RunApp.cpp
@@ -19,7 +19,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-
+#include "abrtlib.h"
 #include "RunApp.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
diff --git a/lib/Utils/DebugDump.h b/lib/Utils/DebugDump.h
index d3eebb45..60d3bd3b 100644
--- a/lib/Utils/DebugDump.h
+++ b/lib/Utils/DebugDump.h
@@ -24,25 +24,6 @@
 #define DEBUGDUMP_H_
 
 #include <string>
-#include <dirent.h>
-#include <stdint.h>
-
-#define FILENAME_ARCHITECTURE       "architecture"
-#define FILENAME_KERNEL             "kernel"
-#define FILENAME_TIME               "time"
-#define FILENAME_UID                "uid"
-#define FILENAME_PACKAGE            "package"
-#define FILENAME_COMPONENT          "component"
-#define FILENAME_DESCRIPTION        "description"
-#define FILENAME_ANALYZER           "analyzer"
-#define FILENAME_RELEASE            "release"
-#define FILENAME_EXECUTABLE         "executable"
-#define FILENAME_REASON             "reason"
-#define FILENAME_COMMENT            "comment"
-#define FILENAME_REPRODUCE          "reproduce"
-#define FILENAME_RATING             "rating"
-#define FILENAME_CMDLINE            "cmdline"
-
 
 class CDebugDump
 {
diff --git a/lib/Utils/daemon.cpp b/lib/Utils/daemon.cpp
index 05270624..7d60ce31 100644
--- a/lib/Utils/daemon.cpp
+++ b/lib/Utils/daemon.cpp
@@ -16,7 +16,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "abrtlib.h"
-#define FILENAME_CMDLINE        "cmdline"
+
 #define VAR_RUN_PID_FILE        VAR_RUN"/abrt.pid"
 
 static char *append_escaped(char *start, const char *s)
diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp
index eca2d419..11037ca7 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 af52b85e..50d0acae 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 1c91dc8a..b844be70 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 c8a25e39..90197ccf 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);