From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 10 Aug 2021 13:21:34 +0000 (+0200)
Subject: refactor: Move static getopt data to global level
X-Git-Tag: v4.4~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2761ebf7f2bd824d25050451e36d49612a494a72;p=thirdparty%2Fccache.git

refactor: Move static getopt data to global level
---

diff --git a/src/core/mainoptions.cpp b/src/core/mainoptions.cpp
index 8d47f34a6..7f2d0f18e 100644
--- a/src/core/mainoptions.cpp
+++ b/src/core/mainoptions.cpp
@@ -189,51 +189,53 @@ get_usage_text()
   return FMT(USAGE_TEXT, CCACHE_NAME);
 }
 
+enum {
+  CHECKSUM_FILE,
+  CONFIG_PATH,
+  DUMP_MANIFEST,
+  DUMP_RESULT,
+  EVICT_OLDER_THAN,
+  EXTRACT_RESULT,
+  HASH_FILE,
+  PRINT_STATS,
+  SHOW_LOG_STATS,
+};
+
+const char options_string[] = "cCd:k:hF:M:po:sVxX:z";
+const option long_options[] = {
+  {"checksum-file", required_argument, nullptr, CHECKSUM_FILE},
+  {"cleanup", no_argument, nullptr, 'c'},
+  {"clear", no_argument, nullptr, 'C'},
+  {"config-path", required_argument, nullptr, CONFIG_PATH},
+  {"directory", required_argument, nullptr, 'd'},
+  {"dump-manifest", required_argument, nullptr, DUMP_MANIFEST},
+  {"dump-result", required_argument, nullptr, DUMP_RESULT},
+  {"evict-older-than", required_argument, nullptr, EVICT_OLDER_THAN},
+  {"extract-result", required_argument, nullptr, EXTRACT_RESULT},
+  {"get-config", required_argument, nullptr, 'k'},
+  {"hash-file", required_argument, nullptr, HASH_FILE},
+  {"help", no_argument, nullptr, 'h'},
+  {"max-files", required_argument, nullptr, 'F'},
+  {"max-size", required_argument, nullptr, 'M'},
+  {"print-stats", no_argument, nullptr, PRINT_STATS},
+  {"recompress", required_argument, nullptr, 'X'},
+  {"set-config", required_argument, nullptr, 'o'},
+  {"show-compression", no_argument, nullptr, 'x'},
+  {"show-config", no_argument, nullptr, 'p'},
+  {"show-log-stats", no_argument, nullptr, SHOW_LOG_STATS},
+  {"show-stats", no_argument, nullptr, 's'},
+  {"version", no_argument, nullptr, 'V'},
+  {"zero-stats", no_argument, nullptr, 'z'},
+  {nullptr, 0, nullptr, 0}};
+
 int
 process_main_options(int argc, const char* const* argv)
 {
-  enum longopts {
-    CHECKSUM_FILE,
-    CONFIG_PATH,
-    DUMP_MANIFEST,
-    DUMP_RESULT,
-    EVICT_OLDER_THAN,
-    EXTRACT_RESULT,
-    HASH_FILE,
-    PRINT_STATS,
-    SHOW_LOG_STATS,
-  };
-  static const struct option options[] = {
-    {"checksum-file", required_argument, nullptr, CHECKSUM_FILE},
-    {"cleanup", no_argument, nullptr, 'c'},
-    {"clear", no_argument, nullptr, 'C'},
-    {"config-path", required_argument, nullptr, CONFIG_PATH},
-    {"directory", required_argument, nullptr, 'd'},
-    {"dump-manifest", required_argument, nullptr, DUMP_MANIFEST},
-    {"dump-result", required_argument, nullptr, DUMP_RESULT},
-    {"evict-older-than", required_argument, nullptr, EVICT_OLDER_THAN},
-    {"extract-result", required_argument, nullptr, EXTRACT_RESULT},
-    {"get-config", required_argument, nullptr, 'k'},
-    {"hash-file", required_argument, nullptr, HASH_FILE},
-    {"help", no_argument, nullptr, 'h'},
-    {"max-files", required_argument, nullptr, 'F'},
-    {"max-size", required_argument, nullptr, 'M'},
-    {"print-stats", no_argument, nullptr, PRINT_STATS},
-    {"recompress", required_argument, nullptr, 'X'},
-    {"set-config", required_argument, nullptr, 'o'},
-    {"show-compression", no_argument, nullptr, 'x'},
-    {"show-config", no_argument, nullptr, 'p'},
-    {"show-log-stats", no_argument, nullptr, SHOW_LOG_STATS},
-    {"show-stats", no_argument, nullptr, 's'},
-    {"version", no_argument, nullptr, 'V'},
-    {"zero-stats", no_argument, nullptr, 'z'},
-    {nullptr, 0, nullptr, 0}};
-
   int c;
   while ((c = getopt_long(argc,
                           const_cast<char* const*>(argv),
-                          "cCd:k:hF:M:po:sVxX:z",
-                          options,
+                          options_string,
+                          long_options,
                           nullptr))
          != -1) {
     Config config;