Let stderr content have an even more special name in result files

diff --git a/src/ccache.c b/src/ccache.c
index 746282fdd5d7a596492b7f9c0f471ed85f7deebc..9189b6e8367c31cbdf36ee53671125f0ea1190b8 100644 (file)
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -1391,7 +1391,7 @@ to_cache(struct args *args, struct hash *depend_mode_hash)
        }
        struct result_files *result_files = result_files_init();
        if (st.st_size > 0) {
-               result_files_add(result_files, tmp_stderr, "stderr");
+               result_files_add(result_files, tmp_stderr, RESULT_STDERR_NAME);
        }
        result_files_add(result_files, output_obj, ".o");
        if (generating_dependencies) {
@@ -2143,7 +2143,7 @@ from_cache(enum fromcache_call_mode mode, bool put_result_in_manifest)
                        result_files_add(result_files, output_dwo, ".dwo");
                }
        }
-       result_files_add(result_files, tmp_stderr, "stderr");
+       result_files_add(result_files, tmp_stderr, RESULT_STDERR_NAME);
        if (produce_dep_file) {
                result_files_add(result_files, output_dep, ".d");
        }

diff --git a/src/result.c b/src/result.c
index e2db4edb4f57d5386ab072745fcf6eb60926124c..b0b0bc4c3445c45e98a1ce7b7d81475354bc3366 100644 (file)
--- a/src/result.c
+++ b/src/result.c
@@ -185,14 +185,14 @@ read_embedded_file_entry(
 
        cc_log("Reading embedded file #%u: %s (%llu)",
               entry_number,
-              str_eq(suffix, "stderr") ? "<stderr>" : suffix,
+              suffix,
               (unsigned long long)filelen);
 
        bool found = false;
        if (dump_stream) {
                fprintf(dump_stream,
                        "Entry: %s (size: %" PRIu64 " bytes)\n",
-                       str_eq(suffix, "stderr") ? "<stderr>" : suffix,
+                       suffix,
                        filelen);
        } else {
                for (uint32_t i = 0; i < list->n_files; i++) {

diff --git a/src/result.h b/src/result.h
index 6860467ee5232485fa12aa9800f2940695759804..71f8ed512581bf645df4ffd52e37103790c32e8c 100644 (file)
--- a/src/result.h
+++ b/src/result.h
@@ -5,6 +5,7 @@
 
 extern const char RESULT_MAGIC[4];
 #define RESULT_VERSION 1
+#define RESULT_STDERR_NAME "<stderr>"
 
 struct result_files;