From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 17 Aug 2023 16:14:37 +0000 (+0200)
Subject: chore: Avoid ccache:disable strings in ccache source code
X-Git-Tag: v4.9~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20438ee6cf077ec6f26fb788e0431c748931e0c4;p=thirdparty%2Fccache.git

chore: Avoid ccache:disable strings in ccache source code

A verbatim ccache:disable string disables ccache when compiling some
ccache sources, which is unnecessary.
---

diff --git a/src/ccache.cpp b/src/ccache.cpp
index b5d30dac7..201d4844b 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -99,7 +99,8 @@ const size_t k_ccache_disable_search_limit = 4096;
 
 // String to look for when checking whether to disable ccache for the input
 // file.
-const char k_ccache_disable_token[] = "ccache:disable";
+const char k_ccache_disable_token[] = {
+  'c', 'c', 'a', 'c', 'h', 'e', ':', 'd', 'i', 's', 'a', 'b', 'l', 'e', '\0'};
 
 namespace {
 
diff --git a/src/core/Statistics.cpp b/src/core/Statistics.cpp
index 240fa1337..ff6d65fed 100644
--- a/src/core/Statistics.cpp
+++ b/src/core/Statistics.cpp
@@ -138,7 +138,7 @@ const StatisticsField k_statistics_fields[] = {
   // A cacheable call resulted in a miss when attempting direct mode lookup.
   FIELD(direct_cache_miss, nullptr),
 
-  // Ccache was disabled by a ccache:disable string in the source code file.
+  // Ccache was disabled by a comment in the source code file.
   FIELD(disabled, "Ccache disabled", FLAG_UNCACHEABLE),
 
   // Failure reading a file specified by extra_files_to_hash/CCACHE_EXTRAFILES.