From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 25 Aug 2019 09:28:54 +0000 (+0200)
Subject: Make legacy_suites a constant
X-Git-Tag: v4.0~810
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3af17a1f9226259beadf37c850f0cee2ea005ca0;p=thirdparty%2Fccache.git

Make legacy_suites a constant
---

diff --git a/unittest/framework.cpp b/unittest/framework.cpp
index 648079e2d..07e0b6f13 100644
--- a/unittest/framework.cpp
+++ b/unittest/framework.cpp
@@ -63,9 +63,9 @@ plural_s(unsigned n)
 }
 
 int
-cct_run(suite_fn* suites, int verbose_output)
+cct_run(const suite_fn* suites, int verbose_output)
 {
-  suite_fn* suite;
+  const suite_fn* suite;
   int tty = is_tty(1);
 
   x_unsetenv("GCC_COLORS"); // Avoid confusing argument processing tests.
diff --git a/unittest/framework.hpp b/unittest/framework.hpp
index f97a71d8a..f8d3c86a5 100644
--- a/unittest/framework.hpp
+++ b/unittest/framework.hpp
@@ -141,7 +141,7 @@
 // ============================================================================
 
 typedef unsigned (*suite_fn)(unsigned);
-int cct_run(suite_fn* suites, int verbose);
+int cct_run(const suite_fn* suites, int verbose);
 
 void cct_suite_begin(const char* name);
 void cct_suite_end(void);
diff --git a/unittest/main.cpp b/unittest/main.cpp
index f802566dc..9636b461f 100644
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -32,22 +32,24 @@ unsigned suite_legacy_util(unsigned);
 unsigned suite_lockfile(unsigned);
 unsigned suite_stats(unsigned);
 
+const suite_fn k_legacy_suites[] = {
+  &suite_args,
+  &suite_argument_processing,
+  &suite_compopt,
+  &suite_compr_type_none,
+  &suite_compr_type_zstd,
+  &suite_counters,
+  &suite_hash,
+  &suite_hashutil,
+  &suite_legacy_util,
+  &suite_lockfile,
+  &suite_stats,
+  NULL,
+};
+
 int
 main(int argc, char** argv)
 {
-  suite_fn legacy_suites[] = {&suite_args,
-                              &suite_argument_processing,
-                              &suite_compopt,
-                              &suite_compr_type_none,
-                              &suite_compr_type_zstd,
-                              &suite_counters,
-                              &suite_hash,
-                              &suite_hashutil,
-                              &suite_legacy_util,
-                              &suite_lockfile,
-                              &suite_stats,
-                              NULL};
-
 #ifdef _WIN32
   x_setenv("CCACHE_DETECT_SHEBANG", "1");
 #endif
@@ -63,7 +65,7 @@ main(int argc, char** argv)
   // Run legacy tests.
   if (result == 0) {
     bool verbose = false;
-    result = cct_run(legacy_suites, verbose);
+    result = cct_run(k_legacy_suites, verbose);
   }
 
   if (result == 0) {