s/CD_DUPHASH/FILENAME_DUPHASH/g

This is needed to make duplicate hash visible for separate programs
looking at crash dumps.

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

4 files changed, 20 insertions, 16 deletions

diff --git a/src/cli/report.cpp b/src/cli/report.cpp
index cb6e2081..46205f7e 100644
--- a/src/cli/report.cpp
+++ b/src/cli/report.cpp
@@ -192,7 +192,7 @@ static void write_crash_report(const map_crash_data_t &report, FILE *fp)
             _("# How to reproduce the crash?"));
     write_crash_report_field(fp, report, FILENAME_BACKTRACE,
             _("# Backtrace\n# Check that it does not contain any sensitive data (passwords, etc.)"));
-    write_crash_report_field(fp, report, CD_DUPHASH, "# DUPHASH");
+    write_crash_report_field(fp, report, FILENAME_DUPHASH, "# DUPHASH");
     write_crash_report_field(fp, report, FILENAME_ARCHITECTURE, _("# Architecture"));
     write_crash_report_field(fp, report, FILENAME_CMDLINE, _("# Command line"));
     write_crash_report_field(fp, report, FILENAME_COMPONENT, _("# Component"));
@@ -279,7 +279,7 @@ static int read_crash_report(map_crash_data_t &report, const char *text)
     result |= read_crash_report_field(text, report, FILENAME_COMMENT);
     result |= read_crash_report_field(text, report, FILENAME_REPRODUCE);
     result |= read_crash_report_field(text, report, FILENAME_BACKTRACE);
-    result |= read_crash_report_field(text, report, CD_DUPHASH);
+    result |= read_crash_report_field(text, report, FILENAME_DUPHASH);
     result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE);
     result |= read_crash_report_field(text, report, FILENAME_CMDLINE);
     result |= read_crash_report_field(text, report, FILENAME_COMPONENT);
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index ae25180f..0bb24634 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -331,7 +331,7 @@ mw_result_t CreateCrashReport(const char *crash_id,
         if (DebugDumpToCrashReport(row->db_dump_dir, pCrashData))
         {
             add_to_crash_data_ext(pCrashData, CD_UUID   , CD_SYS, CD_ISNOTEDITABLE, row->db_uuid);
-            add_to_crash_data_ext(pCrashData, CD_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
+            add_to_crash_data_ext(pCrashData, FILENAME_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
         }
         else
         {
@@ -501,7 +501,7 @@ report_status_t Report(const map_crash_data_t& client_report,
 
     std::string dup_hash = GetGlobalUUID(analyzer.c_str(), pDumpDir.c_str());
     VERB3 log(" DUPHASH:'%s'", dup_hash.c_str());
-    add_to_crash_data_ext(stored_report, CD_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
+    add_to_crash_data_ext(stored_report, FILENAME_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
 
     // Run reporters
 
diff --git a/src/daemon/abrt-action-generate-backtrace.c b/src/daemon/abrt-action-generate-backtrace.c
index 71946f5e..4be123b8 100644
--- a/src/daemon/abrt-action-generate-backtrace.c
+++ b/src/daemon/abrt-action-generate-backtrace.c
@@ -343,7 +343,7 @@ int main(int argc, char **argv)
         strbuf_prepend_str(bt, package);
         char hash_str[SHA1_RESULT_LEN*2 + 1];
         create_hash(hash_str, bt->buf);
-        dd_save_text(dd, FILENAME_GLOBAL_UUID, hash_str);
+        dd_save_text(dd, FILENAME_DUPHASH, hash_str);
         strbuf_free(bt);
 
         /* Compute and store backtrace rating. The crash frame
@@ -384,7 +384,7 @@ int main(int argc, char **argv)
         strbuf_prepend_str(ibt, package);
         char hash_str[SHA1_RESULT_LEN*2 + 1];
         create_hash(hash_str, ibt->buf);
-        dd_save_text(dd, FILENAME_GLOBAL_UUID, hash_str);
+        dd_save_text(dd, FILENAME_DUPHASH, hash_str);
         strbuf_free(ibt);
 
         /* Compute and store backtrace rating. */
diff --git a/src/gui/CCDump.py b/src/gui/CCDump.py
index e6dc78c6..e94d0c9b 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
 
-# Should match CrashTypes.h!
+# Keep in sync with crash_types.h!
 CD_TYPE     = 0
 CD_EDITABLE = 1
 CD_CONTENT  = 2
@@ -12,28 +12,32 @@ CD_SYS = "s"
 CD_BIN = "b"
 CD_TXT = "t"
 
+FILENAME_ANALYZER     = "analyzer"
+FILENAME_EXECUTABLE   = "executable"
+FILENAME_BINARY       = "binary"
+FILENAME_CMDLINE      = "cmdline"
+FILENAME_REASON       = "reason"
+FILENAME_COREDUMP     = "coredump"
+FILENAME_BACKTRACE    = "backtrace"
+FILENAME_MEMORYMAP    = "memorymap"
+FILENAME_DUPHASH      = "global_uuid"
+FILENAME_CRASH_FUNCTION = "crash_function"
 FILENAME_ARCHITECTURE = "architecture"
 FILENAME_KERNEL       = "kernel"
 FILENAME_TIME         = "time"
+FILENAME_RELEASE      = "release"
 FILENAME_PACKAGE      = "package"
 FILENAME_COMPONENT    = "component"
 FILENAME_DESCRIPTION  = "description"
-FILENAME_ANALYZER     = "analyzer"
-FILENAME_RELEASE      = "release"
-FILENAME_EXECUTABLE   = "executable"
-FILENAME_REASON       = "reason"
 FILENAME_COMMENT      = "comment"
 FILENAME_REPRODUCE    = "reproduce"
 FILENAME_RATING       = "rating"
-FILENAME_CMDLINE      = "cmdline"
-FILENAME_COREDUMP     = "coredump"
-FILENAME_BACKTRACE    = "backtrace"
-FILENAME_MEMORYMAP    = "memorymap"
+FILENAME_HOSTNAME     = "hostname"
+FILENAME_REMOTE       = "remote"
 
 CD_UID          = "uid"
 CD_UUID         = "UUID"
 CD_INFORMALL    = "InformAll"
-CD_DUPHASH      = "DUPHASH"
 CD_DUMPDIR      = "DumpDir"
 CD_COUNT        = "Count"
 CD_REPORTED     = "Reported"