chore: Improve code style

diff --git a/.clang-format b/.clang-format
index 33be928c7004c216e6064cd41385b77ac096adc9..ce1527313c822c0a4f75d4cbcbac76c2495a3dec 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -3,6 +3,7 @@
 Language: Cpp
 BasedOnStyle: LLVM
 
+AlignArrayOfStructures: Left
 AllowAllConstructorInitializersOnNextLine: false
 AllowShortFunctionsOnASingleLine: None
 AlwaysBreakAfterReturnType: AllDefinitions
@@ -40,7 +41,9 @@ IncludeCategories:
   - Regex: '^<'
     Priority: 5
 IndentPPDirectives: AfterHash
+InsertNewlineAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: false
+PackConstructorInitializers: Never
 PointerAlignment: Left
 SpaceAfterTemplateKeyword: false
 Standard: Cpp11

diff --git a/src/ccache/args.cpp b/src/ccache/args.cpp
index 19cf78395795cc215d4900bef50924af50f2d904..d1dcf16fcbc51bfdabff48a8c221c75a43b40c5d 100644 (file)
--- a/src/ccache/args.cpp
+++ b/src/ccache/args.cpp
@@ -25,7 +25,8 @@
 #include <ccache/util/logging.hpp>
 #include <ccache/util/string.hpp>
 
-Args::Args(Args&& other) noexcept : m_args(std::move(other.m_args))
+Args::Args(Args&& other) noexcept
+  : m_args(std::move(other.m_args))
 {
 }
 

diff --git a/src/ccache/ccache.cpp b/src/ccache/ccache.cpp
index 65baf6093e7086c315e7092742f6a531c73f8173..c820b68373f1bff9affc21b536999188f48f852e 100644 (file)
--- a/src/ccache/ccache.cpp
+++ b/src/ccache/ccache.cpp
@@ -135,7 +135,8 @@ private:
   std::optional<int> m_exit_code;
 };
 
-inline Failure::Failure(const Statistic statistic) : m_counters({statistic})
+inline Failure::Failure(const Statistic statistic)
+  : m_counters({statistic})
 {
 }
 

diff --git a/src/ccache/compopt.cpp b/src/ccache/compopt.cpp
index dd9cceca8b355604515757cb053abc0823cbe20a..aca1609ea5c1d7827b737ecefe3e6367a8929f38 100644 (file)
--- a/src/ccache/compopt.cpp
+++ b/src/ccache/compopt.cpp
@@ -50,132 +50,132 @@ struct CompOpt
 };
 
 const CompOpt compopts[] = {
-  {"--Werror", TAKES_ARG | AFFECTS_COMP},              // nvcc
-  {"--analyzer-output", TOO_HARD},                     // Clang
-  {"--compiler-bindir", AFFECTS_CPP | TAKES_ARG},      // nvcc
-  {"--compiler-options", AFFECTS_CPP | TAKES_ARG},     // nvcc
-  {"--config", TAKES_ARG},                             // Clang
-  {"--em-config", TAKES_ARG},                          // emcc
-  {"--gcc-toolchain=", TAKES_CONCAT_ARG | TAKES_PATH}, // Clang
-  {"--include", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"--libdevice-directory", AFFECTS_CPP | TAKES_ARG}, // nvcc
-  {"--offload-compress", AFFECTS_COMP},               // Clang
-  {"--output-directory", AFFECTS_CPP | TAKES_ARG},    // nvcc
-  {"--param", TAKES_ARG},
-  {"--save-temps", TOO_HARD},
-  {"--save-temps=cwd", TOO_HARD},
-  {"--save-temps=obj", TOO_HARD},
-  {"--serialize-diagnostics", TAKES_ARG | TAKES_PATH},
-  {"--specs", TAKES_ARG},
-  {"-A", TAKES_ARG},
-  {"-AI", TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
-  {"-B", TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-D", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG},
-  {"-E", TOO_HARD},
-  {"-EP", TOO_HARD}, // msvc
-  {"-F", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-FI", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
-  {"-FU", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
-  {"-Fp", AFFECTS_CPP | TAKES_CONCAT_ARG | TAKES_PATH},             // msvc
-  {"-G", TAKES_ARG},
-  {"-I", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-L", TAKES_ARG},
-  {"-M", TOO_HARD},
-  {"-MF", TAKES_ARG},
-  {"-MJ", TAKES_ARG | TOO_HARD},
-  {"-MM", TOO_HARD},
-  {"-MQ", TAKES_ARG},
-  {"-MT", TAKES_ARG},
-  {"-Tc", TAKES_ARG | TAKES_PATH | TOO_HARD}, // msvc
-  {"-Tp", TAKES_ARG | TAKES_PATH | TOO_HARD}, // msvc
-  {"-U", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG},
-  {"-V", TAKES_ARG},
-  {"-Wa,", TAKES_CONCAT_ARG | AFFECTS_COMP},
-  {"-Werror", AFFECTS_COMP}, // don't exit with error when preprocessing
-  {"-Wl,", TAKES_CONCAT_ARG | AFFECTS_COMP},
-  {"-Wno-error", AFFECTS_COMP},
-  {"-Xassembler", TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP},
-  {"-Xclang", TAKES_ARG},
-  {"-Xcompiler", AFFECTS_CPP | TAKES_ARG}, // nvcc
-  {"-Xlinker", TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP},
-  {"-Xpreprocessor", AFFECTS_CPP | TAKES_ARG},
-  {"-Yc", AFFECTS_CPP | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
-  {"-Yu", AFFECTS_CPP | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
-  {"-all_load", AFFECTS_COMP},
-  {"-analyze", TOO_HARD}, // Clang
-  {"-arch", TAKES_ARG},
-  {"-ast-dump", AFFECTS_COMP},                         // Clang
-  {"-ast-dump-all", AFFECTS_COMP},                     // Clang
-  {"-ast-dump-all=", AFFECTS_COMP | TAKES_CONCAT_ARG}, // Clang
-  {"-ast-dump-decl-types", AFFECTS_COMP},              // Clang
-  {"-ast-dump-filter", AFFECTS_COMP | TAKES_ARG},      // Clang
-  {"-ast-dump-lookups", AFFECTS_COMP},                 // Clang
-  {"-ast-dump=", AFFECTS_COMP | TAKES_CONCAT_ARG},     // Clang
-  {"-ast-list", AFFECTS_COMP},                         // Clang
-  {"-ast-merge", TOO_HARD | TAKES_ARG},                // Clang
-  {"-ast-print", AFFECTS_COMP},                        // Clang
-  {"-ast-view", TOO_HARD},                             // Clang
-  {"-aux-info", TAKES_ARG},
-  {"-b", TAKES_ARG},
-  {"-bind_at_load", AFFECTS_COMP},
-  {"-bundle", AFFECTS_COMP},
-  {"-ccbin", AFFECTS_CPP | TAKES_ARG}, // nvcc
-  {"-emit-pch", AFFECTS_COMP},         // Clang
-  {"-emit-pth", AFFECTS_COMP},         // Clang
+  {"--Werror",                TAKES_ARG | AFFECTS_COMP                               }, // nvcc
+  {"--analyzer-output",       TOO_HARD                                               }, // Clang
+  {"--compiler-bindir",       AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"--compiler-options",      AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"--config",                TAKES_ARG                                              }, // Clang
+  {"--em-config",             TAKES_ARG                                              }, // emcc
+  {"--gcc-toolchain=",        TAKES_CONCAT_ARG | TAKES_PATH                          }, // Clang
+  {"--include",               AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"--libdevice-directory",   AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"--offload-compress",      AFFECTS_COMP                                           }, // Clang
+  {"--output-directory",      AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"--param",                 TAKES_ARG                                              },
+  {"--save-temps",            TOO_HARD                                               },
+  {"--save-temps=cwd",        TOO_HARD                                               },
+  {"--save-temps=obj",        TOO_HARD                                               },
+  {"--serialize-diagnostics", TAKES_ARG | TAKES_PATH                                 },
+  {"--specs",                 TAKES_ARG                                              },
+  {"-A",                      TAKES_ARG                                              },
+  {"-AI",                     TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH              }, // msvc
+  {"-B",                      TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH              },
+  {"-D",                      AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG             },
+  {"-E",                      TOO_HARD                                               },
+  {"-EP",                     TOO_HARD                                               }, // msvc
+  {"-F",                      AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-FI",                     AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
+  {"-FU",                     AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
+  {"-Fp",                     AFFECTS_CPP | TAKES_CONCAT_ARG | TAKES_PATH            }, // msvc
+  {"-G",                      TAKES_ARG                                              },
+  {"-I",                      AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-L",                      TAKES_ARG                                              },
+  {"-M",                      TOO_HARD                                               },
+  {"-MF",                     TAKES_ARG                                              },
+  {"-MJ",                     TAKES_ARG | TOO_HARD                                   },
+  {"-MM",                     TOO_HARD                                               },
+  {"-MQ",                     TAKES_ARG                                              },
+  {"-MT",                     TAKES_ARG                                              },
+  {"-Tc",                     TAKES_ARG | TAKES_PATH | TOO_HARD                      }, // msvc
+  {"-Tp",                     TAKES_ARG | TAKES_PATH | TOO_HARD                      }, // msvc
+  {"-U",                      AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG             },
+  {"-V",                      TAKES_ARG                                              },
+  {"-Wa,",                    TAKES_CONCAT_ARG | AFFECTS_COMP                        },
+  {"-Werror",                 AFFECTS_COMP                                           }, // don't exit with error when preprocessing
+  {"-Wl,",                    TAKES_CONCAT_ARG | AFFECTS_COMP                        },
+  {"-Wno-error",              AFFECTS_COMP                                           },
+  {"-Xassembler",             TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP            },
+  {"-Xclang",                 TAKES_ARG                                              },
+  {"-Xcompiler",              AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"-Xlinker",                TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP            },
+  {"-Xpreprocessor",          AFFECTS_CPP | TAKES_ARG                                },
+  {"-Yc",                     AFFECTS_CPP | TAKES_CONCAT_ARG | TAKES_PATH            }, // msvc
+  {"-Yu",                     AFFECTS_CPP | TAKES_CONCAT_ARG | TAKES_PATH            }, // msvc
+  {"-all_load",               AFFECTS_COMP                                           },
+  {"-analyze",                TOO_HARD                                               }, // Clang
+  {"-arch",                   TAKES_ARG                                              },
+  {"-ast-dump",               AFFECTS_COMP                                           }, // Clang
+  {"-ast-dump-all",           AFFECTS_COMP                                           }, // Clang
+  {"-ast-dump-all=",          AFFECTS_COMP | TAKES_CONCAT_ARG                        }, // Clang
+  {"-ast-dump-decl-types",    AFFECTS_COMP                                           }, // Clang
+  {"-ast-dump-filter",        AFFECTS_COMP | TAKES_ARG                               }, // Clang
+  {"-ast-dump-lookups",       AFFECTS_COMP                                           }, // Clang
+  {"-ast-dump=",              AFFECTS_COMP | TAKES_CONCAT_ARG                        }, // Clang
+  {"-ast-list",               AFFECTS_COMP                                           }, // Clang
+  {"-ast-merge",              TOO_HARD | TAKES_ARG                                   }, // Clang
+  {"-ast-print",              AFFECTS_COMP                                           }, // Clang
+  {"-ast-view",               TOO_HARD                                               }, // Clang
+  {"-aux-info",               TAKES_ARG                                              },
+  {"-b",                      TAKES_ARG                                              },
+  {"-bind_at_load",           AFFECTS_COMP                                           },
+  {"-bundle",                 AFFECTS_COMP                                           },
+  {"-ccbin",                  AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"-emit-pch",               AFFECTS_COMP                                           }, // Clang
+  {"-emit-pth",               AFFECTS_COMP                                           }, // Clang
   {"-external:I",
-   AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, // msvc
-  {"-fbuild-session-file=", TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-fmodule-header", TOO_HARD},
-  {"-fmodule-map-file=", TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-fmodules-cache-path=", TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-fmodules-ts", TOO_HARD},
-  {"-fno-working-directory", AFFECTS_CPP},
-  {"-fplugin=libcc1plugin", TOO_HARD}, // interaction with GDB
-  {"-frepo", TOO_HARD},
-  {"-ftime-trace", TOO_HARD}, // Clang
-  {"-fworking-directory", AFFECTS_CPP},
-  {"-gcc-toolchain", TAKES_ARG | TAKES_PATH},       // Clang
-  {"-gen-cdb-fragment-path", TAKES_ARG | TOO_HARD}, // Clang
-  {"-gtoggle", TOO_HARD},
-  {"-idirafter", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-iframework", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-imacros", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-imsvc", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-imultilib", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-include", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-include-pch", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-include-pth", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-install_name", TAKES_ARG}, // Darwin linker option
-  {"-iprefix", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-iquote", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-isysroot", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-isystem", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-ivfsoverlay", TAKES_ARG | TAKES_PATH},
-  {"-ivfsstatcache", TAKES_ARG},
-  {"-iwithprefix", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+   AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH                           }, // msvc
+  {"-fbuild-session-file=",   TAKES_CONCAT_ARG | TAKES_PATH                          },
+  {"-fmodule-header",         TOO_HARD                                               },
+  {"-fmodule-map-file=",      TAKES_CONCAT_ARG | TAKES_PATH                          },
+  {"-fmodules-cache-path=",   TAKES_CONCAT_ARG | TAKES_PATH                          },
+  {"-fmodules-ts",            TOO_HARD                                               },
+  {"-fno-working-directory",  AFFECTS_CPP                                            },
+  {"-fplugin=libcc1plugin",   TOO_HARD                                               }, // interaction with GDB
+  {"-frepo",                  TOO_HARD                                               },
+  {"-ftime-trace",            TOO_HARD                                               }, // Clang
+  {"-fworking-directory",     AFFECTS_CPP                                            },
+  {"-gcc-toolchain",          TAKES_ARG | TAKES_PATH                                 }, // Clang
+  {"-gen-cdb-fragment-path",  TAKES_ARG | TOO_HARD                                   }, // Clang
+  {"-gtoggle",                TOO_HARD                                               },
+  {"-idirafter",              AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-iframework",             AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-imacros",                AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-imsvc",                  AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-imultilib",              AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-include",                AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-include-pch",            AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-include-pth",            AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-install_name",           TAKES_ARG                                              }, // Darwin linker option
+  {"-iprefix",                AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-iquote",                 AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-isysroot",               AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-isystem",                AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"-ivfsoverlay",            TAKES_ARG | TAKES_PATH                                 },
+  {"-ivfsstatcache",          TAKES_ARG                                              },
+  {"-iwithprefix",            AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
   {"-iwithprefixbefore",
-   AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
-  {"-ldir", AFFECTS_CPP | TAKES_ARG}, // nvcc
-  {"-link", TOO_HARD},                // msvc
-  {"-nolibc", AFFECTS_COMP},
-  {"-nostdinc", AFFECTS_CPP},
-  {"-nostdinc++", AFFECTS_CPP},
-  {"-odir", AFFECTS_CPP | TAKES_ARG}, // nvcc
-  {"-pie", AFFECTS_COMP},
-  {"-prebind", AFFECTS_COMP},
-  {"-preload", AFFECTS_COMP},
-  {"-rdynamic", AFFECTS_COMP},
-  {"-remap", AFFECTS_CPP},
-  {"-save-temps", TOO_HARD},
-  {"-save-temps=cwd", TOO_HARD},
-  {"-save-temps=obj", TOO_HARD},
-  {"-specs", TAKES_ARG},
-  {"-stdlib=", AFFECTS_CPP | TAKES_CONCAT_ARG},
-  {"-trigraphs", AFFECTS_CPP},
-  {"-u", TAKES_ARG | TAKES_CONCAT_ARG},
-  {"-v", AFFECTS_COMP},
-  {"-wrapper", TAKES_ARG | TOO_HARD},
-  {"-z", TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP},
+   AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH                           },
+  {"-ldir",                   AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"-link",                   TOO_HARD                                               }, // msvc
+  {"-nolibc",                 AFFECTS_COMP                                           },
+  {"-nostdinc",               AFFECTS_CPP                                            },
+  {"-nostdinc++",             AFFECTS_CPP                                            },
+  {"-odir",                   AFFECTS_CPP | TAKES_ARG                                }, // nvcc
+  {"-pie",                    AFFECTS_COMP                                           },
+  {"-prebind",                AFFECTS_COMP                                           },
+  {"-preload",                AFFECTS_COMP                                           },
+  {"-rdynamic",               AFFECTS_COMP                                           },
+  {"-remap",                  AFFECTS_CPP                                            },
+  {"-save-temps",             TOO_HARD                                               },
+  {"-save-temps=cwd",         TOO_HARD                                               },
+  {"-save-temps=obj",         TOO_HARD                                               },
+  {"-specs",                  TAKES_ARG                                              },
+  {"-stdlib=",                AFFECTS_CPP | TAKES_CONCAT_ARG                         },
+  {"-trigraphs",              AFFECTS_CPP                                            },
+  {"-u",                      TAKES_ARG | TAKES_CONCAT_ARG                           },
+  {"-v",                      AFFECTS_COMP                                           },
+  {"-wrapper",                TAKES_ARG | TOO_HARD                                   },
+  {"-z",                      TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP            },
 };
 
 static int

diff --git a/src/ccache/config.cpp b/src/ccache/config.cpp
index 963202ef5cccc6c758ad832db62258a2a9d0a4d9..66b89655da522294922d12a86fc06661faa29d58 100644 (file)
--- a/src/ccache/config.cpp
+++ b/src/ccache/config.cpp
@@ -130,102 +130,102 @@ struct ConfigKeyTableEntry
 
 const std::unordered_map<std::string, ConfigKeyTableEntry> k_config_key_table =
   {
-    {"absolute_paths_in_stderr", {ConfigItem::absolute_paths_in_stderr}},
-    {"base_dir", {ConfigItem::base_dir}},
-    {"cache_dir", {ConfigItem::cache_dir}},
-    {"compiler", {ConfigItem::compiler}},
-    {"compiler_check", {ConfigItem::compiler_check}},
-    {"compiler_type", {ConfigItem::compiler_type}},
-    {"compression", {ConfigItem::compression}},
-    {"compression_level", {ConfigItem::compression_level}},
-    {"cpp_extension", {ConfigItem::cpp_extension}},
-    {"debug", {ConfigItem::debug}},
-    {"debug_dir", {ConfigItem::debug_dir}},
-    {"debug_level", {ConfigItem::debug_level}},
-    {"depend_mode", {ConfigItem::depend_mode}},
-    {"direct_mode", {ConfigItem::direct_mode}},
-    {"disable", {ConfigItem::disable}},
-    {"extra_files_to_hash", {ConfigItem::extra_files_to_hash}},
-    {"file_clone", {ConfigItem::file_clone}},
-    {"hard_link", {ConfigItem::hard_link}},
-    {"hash_dir", {ConfigItem::hash_dir}},
-    {"ignore_headers_in_manifest", {ConfigItem::ignore_headers_in_manifest}},
-    {"ignore_options", {ConfigItem::ignore_options}},
-    {"inode_cache", {ConfigItem::inode_cache}},
-    {"keep_comments_cpp", {ConfigItem::keep_comments_cpp}},
-    {"log_file", {ConfigItem::log_file}},
-    {"max_files", {ConfigItem::max_files}},
-    {"max_size", {ConfigItem::max_size}},
-    {"msvc_dep_prefix", {ConfigItem::msvc_dep_prefix}},
-    {"namespace", {ConfigItem::namespace_}},
-    {"path", {ConfigItem::path}},
-    {"pch_external_checksum", {ConfigItem::pch_external_checksum}},
-    {"prefix_command", {ConfigItem::prefix_command}},
-    {"prefix_command_cpp", {ConfigItem::prefix_command_cpp}},
-    {"read_only", {ConfigItem::read_only}},
-    {"read_only_direct", {ConfigItem::read_only_direct}},
-    {"recache", {ConfigItem::recache}},
-    {"remote_only", {ConfigItem::remote_only}},
-    {"remote_storage", {ConfigItem::remote_storage}},
-    {"reshare", {ConfigItem::reshare}},
-    {"response_file_format", {ConfigItem::response_file_format}},
-    {"run_second_cpp", {ConfigItem::run_second_cpp}},
-    {"secondary_storage", {ConfigItem::remote_storage, "remote_storage"}},
-    {"sloppiness", {ConfigItem::sloppiness}},
-    {"stats", {ConfigItem::stats}},
-    {"stats_log", {ConfigItem::stats_log}},
-    {"temporary_dir", {ConfigItem::temporary_dir}},
-    {"umask", {ConfigItem::umask}},
+    {"absolute_paths_in_stderr",   {ConfigItem::absolute_paths_in_stderr}        },
+    {"base_dir",                   {ConfigItem::base_dir}                        },
+    {"cache_dir",                  {ConfigItem::cache_dir}                       },
+    {"compiler",                   {ConfigItem::compiler}                        },
+    {"compiler_check",             {ConfigItem::compiler_check}                  },
+    {"compiler_type",              {ConfigItem::compiler_type}                   },
+    {"compression",                {ConfigItem::compression}                     },
+    {"compression_level",          {ConfigItem::compression_level}               },
+    {"cpp_extension",              {ConfigItem::cpp_extension}                   },
+    {"debug",                      {ConfigItem::debug}                           },
+    {"debug_dir",                  {ConfigItem::debug_dir}                       },
+    {"debug_level",                {ConfigItem::debug_level}                     },
+    {"depend_mode",                {ConfigItem::depend_mode}                     },
+    {"direct_mode",                {ConfigItem::direct_mode}                     },
+    {"disable",                    {ConfigItem::disable}                         },
+    {"extra_files_to_hash",        {ConfigItem::extra_files_to_hash}             },
+    {"file_clone",                 {ConfigItem::file_clone}                      },
+    {"hard_link",                  {ConfigItem::hard_link}                       },
+    {"hash_dir",                   {ConfigItem::hash_dir}                        },
+    {"ignore_headers_in_manifest", {ConfigItem::ignore_headers_in_manifest}      },
+    {"ignore_options",             {ConfigItem::ignore_options}                  },
+    {"inode_cache",                {ConfigItem::inode_cache}                     },
+    {"keep_comments_cpp",          {ConfigItem::keep_comments_cpp}               },
+    {"log_file",                   {ConfigItem::log_file}                        },
+    {"max_files",                  {ConfigItem::max_files}                       },
+    {"max_size",                   {ConfigItem::max_size}                        },
+    {"msvc_dep_prefix",            {ConfigItem::msvc_dep_prefix}                 },
+    {"namespace",                  {ConfigItem::namespace_}                      },
+    {"path",                       {ConfigItem::path}                            },
+    {"pch_external_checksum",      {ConfigItem::pch_external_checksum}           },
+    {"prefix_command",             {ConfigItem::prefix_command}                  },
+    {"prefix_command_cpp",         {ConfigItem::prefix_command_cpp}              },
+    {"read_only",                  {ConfigItem::read_only}                       },
+    {"read_only_direct",           {ConfigItem::read_only_direct}                },
+    {"recache",                    {ConfigItem::recache}                         },
+    {"remote_only",                {ConfigItem::remote_only}                     },
+    {"remote_storage",             {ConfigItem::remote_storage}                  },
+    {"reshare",                    {ConfigItem::reshare}                         },
+    {"response_file_format",       {ConfigItem::response_file_format}            },
+    {"run_second_cpp",             {ConfigItem::run_second_cpp}                  },
+    {"secondary_storage",          {ConfigItem::remote_storage, "remote_storage"}},
+    {"sloppiness",                 {ConfigItem::sloppiness}                      },
+    {"stats",                      {ConfigItem::stats}                           },
+    {"stats_log",                  {ConfigItem::stats_log}                       },
+    {"temporary_dir",              {ConfigItem::temporary_dir}                   },
+    {"umask",                      {ConfigItem::umask}                           },
 };
 
 const std::unordered_map<std::string, std::string> k_env_variable_table = {
-  {"ABSSTDERR", "absolute_paths_in_stderr"},
-  {"BASEDIR", "base_dir"},
-  {"CC", "compiler"}, // Alias for CCACHE_COMPILER
-  {"COMMENTS", "keep_comments_cpp"},
-  {"COMPILER", "compiler"},
-  {"COMPILERCHECK", "compiler_check"},
-  {"COMPILERTYPE", "compiler_type"},
-  {"COMPRESS", "compression"},
-  {"COMPRESSLEVEL", "compression_level"},
-  {"CPP2", "run_second_cpp"},
-  {"DEBUG", "debug"},
-  {"DEBUGDIR", "debug_dir"},
-  {"DEBUGLEVEL", "debug_level"},
-  {"DEPEND", "depend_mode"},
-  {"DIR", "cache_dir"},
-  {"DIRECT", "direct_mode"},
-  {"DISABLE", "disable"},
-  {"EXTENSION", "cpp_extension"},
-  {"EXTRAFILES", "extra_files_to_hash"},
-  {"FILECLONE", "file_clone"},
-  {"HARDLINK", "hard_link"},
-  {"HASHDIR", "hash_dir"},
-  {"IGNOREHEADERS", "ignore_headers_in_manifest"},
-  {"IGNOREOPTIONS", "ignore_options"},
-  {"INODECACHE", "inode_cache"},
-  {"LOGFILE", "log_file"},
-  {"MAXFILES", "max_files"},
-  {"MAXSIZE", "max_size"},
-  {"MSVC_DEP_PREFIX", "msvc_dep_prefix"},
-  {"NAMESPACE", "namespace"},
-  {"PATH", "path"},
-  {"PCH_EXTSUM", "pch_external_checksum"},
-  {"PREFIX", "prefix_command"},
-  {"PREFIX_CPP", "prefix_command_cpp"},
-  {"READONLY", "read_only"},
-  {"READONLY_DIRECT", "read_only_direct"},
-  {"RECACHE", "recache"},
-  {"REMOTE_ONLY", "remote_only"},
-  {"REMOTE_STORAGE", "remote_storage"},
-  {"RESHARE", "reshare"},
-  {"RESPONSE_FILE_FORMAT", "response_file_format"},
-  {"SECONDARY_STORAGE", "remote_storage"}, // Alias for CCACHE_REMOTE_STORAGE
-  {"SLOPPINESS", "sloppiness"},
-  {"STATS", "stats"},
-  {"STATSLOG", "stats_log"},
-  {"TEMPDIR", "temporary_dir"},
-  {"UMASK", "umask"},
+  {"ABSSTDERR",            "absolute_paths_in_stderr"  },
+  {"BASEDIR",              "base_dir"                  },
+  {"CC",                   "compiler"                  }, // Alias for CCACHE_COMPILER
+  {"COMMENTS",             "keep_comments_cpp"         },
+  {"COMPILER",             "compiler"                  },
+  {"COMPILERCHECK",        "compiler_check"            },
+  {"COMPILERTYPE",         "compiler_type"             },
+  {"COMPRESS",             "compression"               },
+  {"COMPRESSLEVEL",        "compression_level"         },
+  {"CPP2",                 "run_second_cpp"            },
+  {"DEBUG",                "debug"                     },
+  {"DEBUGDIR",             "debug_dir"                 },
+  {"DEBUGLEVEL",           "debug_level"               },
+  {"DEPEND",               "depend_mode"               },
+  {"DIR",                  "cache_dir"                 },
+  {"DIRECT",               "direct_mode"               },
+  {"DISABLE",              "disable"                   },
+  {"EXTENSION",            "cpp_extension"             },
+  {"EXTRAFILES",           "extra_files_to_hash"       },
+  {"FILECLONE",            "file_clone"                },
+  {"HARDLINK",             "hard_link"                 },
+  {"HASHDIR",              "hash_dir"                  },
+  {"IGNOREHEADERS",        "ignore_headers_in_manifest"},
+  {"IGNOREOPTIONS",        "ignore_options"            },
+  {"INODECACHE",           "inode_cache"               },
+  {"LOGFILE",              "log_file"                  },
+  {"MAXFILES",             "max_files"                 },
+  {"MAXSIZE",              "max_size"                  },
+  {"MSVC_DEP_PREFIX",      "msvc_dep_prefix"           },
+  {"NAMESPACE",            "namespace"                 },
+  {"PATH",                 "path"                      },
+  {"PCH_EXTSUM",           "pch_external_checksum"     },
+  {"PREFIX",               "prefix_command"            },
+  {"PREFIX_CPP",           "prefix_command_cpp"        },
+  {"READONLY",             "read_only"                 },
+  {"READONLY_DIRECT",      "read_only_direct"          },
+  {"RECACHE",              "recache"                   },
+  {"REMOTE_ONLY",          "remote_only"               },
+  {"REMOTE_STORAGE",       "remote_storage"            },
+  {"RESHARE",              "reshare"                   },
+  {"RESPONSE_FILE_FORMAT", "response_file_format"      },
+  {"SECONDARY_STORAGE",    "remote_storage"            }, // Alias for CCACHE_REMOTE_STORAGE
+  {"SLOPPINESS",           "sloppiness"                },
+  {"STATS",                "stats"                     },
+  {"STATSLOG",             "stats_log"                 },
+  {"TEMPDIR",              "temporary_dir"             },
+  {"UMASK",                "umask"                     },
 };
 
 Args::ResponseFileFormat

diff --git a/src/ccache/core/atomicfile.cpp b/src/ccache/core/atomicfile.cpp
index ab48ceabda359adf063dcb6f865286143f80f076..d501328021c6104445cfe9a245c4db03082720b7 100644 (file)
--- a/src/ccache/core/atomicfile.cpp
+++ b/src/ccache/core/atomicfile.cpp
@@ -30,7 +30,8 @@ namespace fs = util::filesystem;
 
 namespace core {
 
-AtomicFile::AtomicFile(const fs::path& path, Mode mode) : m_path(path)
+AtomicFile::AtomicFile(const fs::path& path, Mode mode)
+  : m_path(path)
 {
   auto tmp_file =
     util::value_or_throw<core::Error>(util::TemporaryFile::create(path));

diff --git a/src/ccache/core/cacheentry.cpp b/src/ccache/core/cacheentry.cpp
index 6b86aa32aeb4b6dd11d2a8f9ce91bfee212a504e..805fd8ab8b7d2ff32fec90c364b83587f7d6ad78 100644 (file)
--- a/src/ccache/core/cacheentry.cpp
+++ b/src/ccache/core/cacheentry.cpp
@@ -194,7 +194,8 @@ CacheEntry::Header::uncompressed_payload_size() const
                                - k_epilogue_fields_size);
 }
 
-CacheEntry::CacheEntry(nonstd::span<const uint8_t> data) : m_header(data)
+CacheEntry::CacheEntry(nonstd::span<const uint8_t> data)
+  : m_header(data)
 {
   const size_t non_payload_size =
     m_header.serialized_size() + k_epilogue_fields_size;

diff --git a/src/ccache/core/mainoptions.cpp b/src/ccache/core/mainoptions.cpp
index b31190826de8bdce7ae3cd97f077397230fc2775..d0d2a5f9b2c6b41b250f3833233b41829b09ff71 100644 (file)
--- a/src/ccache/core/mainoptions.cpp
+++ b/src/ccache/core/mainoptions.cpp
@@ -453,51 +453,49 @@ enum : uint8_t {
   TRIM_MAX_SIZE,
   TRIM_METHOD,
   TRIM_RECOMPRESS,
-  TRIM_RECOMPRESS_THREADS,
+  TRIM_RECOMP_THREADS,
 };
 
 const char options_string[] = "cCd:k:hF:M:po:svVxX: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},
-  {"dir", required_argument, nullptr, 'd'},
-  {"directory", required_argument, nullptr, 'd'},               // bwd compat
-  {"dump-manifest", required_argument, nullptr, DUMP_MANIFEST}, // bwd compat
-  {"dump-result", required_argument, nullptr, DUMP_RESULT},     // bwd compat
-  {"evict-namespace", required_argument, nullptr, EVICT_NAMESPACE},
-  {"evict-older-than", required_argument, nullptr, EVICT_OLDER_THAN},
-  {"extract-result", required_argument, nullptr, EXTRACT_RESULT},
-  {"format", required_argument, nullptr, FORMAT},
-  {"get-config", required_argument, nullptr, 'k'},
-  {"hash-file", required_argument, nullptr, HASH_FILE},
-  {"help", no_argument, nullptr, 'h'},
-  {"inspect", required_argument, nullptr, INSPECT},
-  {"max-files", required_argument, nullptr, 'F'},
-  {"max-size", required_argument, nullptr, 'M'},
-  {"print-log-stats", no_argument, nullptr, PRINT_LOG_STATS},
-  {"print-stats", no_argument, nullptr, PRINT_STATS},
-  {"print-version", no_argument, nullptr, PRINT_VERSION},
-  {"recompress", required_argument, nullptr, 'X'},
-  {"recompress-threads", required_argument, nullptr, RECOMPRESS_THREADS},
-  {"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'},
-  {"trim-dir", required_argument, nullptr, TRIM_DIR},
-  {"trim-max-size", required_argument, nullptr, TRIM_MAX_SIZE},
-  {"trim-method", required_argument, nullptr, TRIM_METHOD},
-  {"trim-recompress", required_argument, nullptr, TRIM_RECOMPRESS},
-  {"trim-recompress-threads",
-   required_argument,
-   nullptr,
-   TRIM_RECOMPRESS_THREADS},
-  {"verbose", no_argument, nullptr, 'v'},
-  {"version", no_argument, nullptr, 'V'},
-  {"zero-stats", no_argument, nullptr, 'z'},
-  {nullptr, 0, nullptr, 0}};
+  {"checksum-file",           required_argument, nullptr, CHECKSUM_FILE      },
+  {"cleanup",                 no_argument,       nullptr, 'c'                },
+  {"clear",                   no_argument,       nullptr, 'C'                },
+  {"config-path",             required_argument, nullptr, CONFIG_PATH        },
+  {"dir",                     required_argument, nullptr, 'd'                },
+  {"directory",               required_argument, nullptr, 'd'                }, // bwd compat
+  {"dump-manifest",           required_argument, nullptr, DUMP_MANIFEST      }, // bwd compat
+  {"dump-result",             required_argument, nullptr, DUMP_RESULT        }, // bwd compat
+  {"evict-namespace",         required_argument, nullptr, EVICT_NAMESPACE    },
+  {"evict-older-than",        required_argument, nullptr, EVICT_OLDER_THAN   },
+  {"extract-result",          required_argument, nullptr, EXTRACT_RESULT     },
+  {"format",                  required_argument, nullptr, FORMAT             },
+  {"get-config",              required_argument, nullptr, 'k'                },
+  {"hash-file",               required_argument, nullptr, HASH_FILE          },
+  {"help",                    no_argument,       nullptr, 'h'                },
+  {"inspect",                 required_argument, nullptr, INSPECT            },
+  {"max-files",               required_argument, nullptr, 'F'                },
+  {"max-size",                required_argument, nullptr, 'M'                },
+  {"print-log-stats",         no_argument,       nullptr, PRINT_LOG_STATS    },
+  {"print-stats",             no_argument,       nullptr, PRINT_STATS        },
+  {"print-version",           no_argument,       nullptr, PRINT_VERSION      },
+  {"recompress",              required_argument, nullptr, 'X'                },
+  {"recompress-threads",      required_argument, nullptr, RECOMPRESS_THREADS },
+  {"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'                },
+  {"trim-dir",                required_argument, nullptr, TRIM_DIR           },
+  {"trim-max-size",           required_argument, nullptr, TRIM_MAX_SIZE      },
+  {"trim-method",             required_argument, nullptr, TRIM_METHOD        },
+  {"trim-recompress",         required_argument, nullptr, TRIM_RECOMPRESS    },
+  {"trim-recompress-threads", required_argument, nullptr, TRIM_RECOMP_THREADS},
+  {"verbose",                 no_argument,       nullptr, 'v'                },
+  {"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)
@@ -568,7 +566,7 @@ process_main_options(int argc, const char* const* argv)
       trim_recompress = parse_compression_level(arg);
       break;
 
-    case TRIM_RECOMPRESS_THREADS:
+    case TRIM_RECOMP_THREADS:
       trim_recompress_threads =
         static_cast<uint32_t>(util::value_or_throw<Error>(util::parse_unsigned(
           arg, 1, std::numeric_limits<uint32_t>::max(), "threads")));
@@ -607,7 +605,7 @@ process_main_options(int argc, const char* const* argv)
     case TRIM_MAX_SIZE:
     case TRIM_METHOD:
     case TRIM_RECOMPRESS:
-    case TRIM_RECOMPRESS_THREADS:
+    case TRIM_RECOMP_THREADS:
     case 'v': // --verbose
       // Already handled in the first pass.
       break;

diff --git a/src/ccache/core/result.cpp b/src/ccache/core/result.cpp
index 66d9750a8f7575ebe6b046187699f144e52d885a..bd046069eb7315ed6ad50400f3bc3f18b2ab99a2 100644 (file)
--- a/src/ccache/core/result.cpp
+++ b/src/ccache/core/result.cpp
@@ -176,7 +176,8 @@ gcno_file_in_unmangled_form(const Context& ctx)
   return util::with_extension(ctx.args_info.output_obj, ".gcno");
 }
 
-Deserializer::Deserializer(nonstd::span<const uint8_t> data) : m_data(data)
+Deserializer::Deserializer(nonstd::span<const uint8_t> data)
+  : m_data(data)
 {
 }
 

diff --git a/src/ccache/core/resultinspector.cpp b/src/ccache/core/resultinspector.cpp
index 62fc6259a802270828947631293742c0407685fa..ab81036061bd055f5ca73b95820534648cd827cf 100644 (file)
--- a/src/ccache/core/resultinspector.cpp
+++ b/src/ccache/core/resultinspector.cpp
@@ -24,7 +24,8 @@
 
 namespace core {
 
-ResultInspector::ResultInspector(FILE* stream) : m_stream(stream)
+ResultInspector::ResultInspector(FILE* stream)
+  : m_stream(stream)
 {
 }
 

diff --git a/src/ccache/core/statslog.hpp b/src/ccache/core/statslog.hpp
index 7d849f255cbd188928e4688231dbe84e6c1726de..0093d46b2050f23db9495ea05c65fa2d54210afb 100644 (file)
--- a/src/ccache/core/statslog.hpp
+++ b/src/ccache/core/statslog.hpp
@@ -41,7 +41,8 @@ private:
 
 // --- Inline implementations ---
 
-inline StatsLog::StatsLog(const std::filesystem::path& path) : m_path(path)
+inline StatsLog::StatsLog(const std::filesystem::path& path)
+  : m_path(path)
 {
 }
 

diff --git a/src/ccache/language.cpp b/src/ccache/language.cpp
index 41db79a4df3334ae042dfd465046e1087b8b2225..ff068ea1936b64b8c4e9f78369d7f242be26abaa 100644 (file)
--- a/src/ccache/language.cpp
+++ b/src/ccache/language.cpp
@@ -31,47 +31,47 @@ const struct
   const char* extension;
   const char* language;
 } k_ext_lang_table[] = {
-  {".c", "c"},
-  {".C", "c++"},
-  {".cc", "c++"},
-  {".CC", "c++"},
-  {".cp", "c++"},
-  {".CP", "c++"},
-  {".cpp", "c++"},
-  {".CPP", "c++"},
-  {".cxx", "c++"},
-  {".CXX", "c++"},
-  {".c++", "c++"},
-  {".C++", "c++"},
-  {".m", "objective-c"},
-  {".M", "objective-c++"},
-  {".mm", "objective-c++"},
-  {".sx", "assembler-with-cpp"},
-  {".S", "assembler-with-cpp"},
+  {".c",    "c"                       },
+  {".C",    "c++"                     },
+  {".cc",   "c++"                     },
+  {".CC",   "c++"                     },
+  {".cp",   "c++"                     },
+  {".CP",   "c++"                     },
+  {".cpp",  "c++"                     },
+  {".CPP",  "c++"                     },
+  {".cxx",  "c++"                     },
+  {".CXX",  "c++"                     },
+  {".c++",  "c++"                     },
+  {".C++",  "c++"                     },
+  {".m",    "objective-c"             },
+  {".M",    "objective-c++"           },
+  {".mm",   "objective-c++"           },
+  {".sx",   "assembler-with-cpp"      },
+  {".S",    "assembler-with-cpp"      },
   // Preprocessed:
-  {".i", "cpp-output"},
-  {".ii", "c++-cpp-output"},
-  {".mi", "objective-c-cpp-output"},
-  {".mii", "objective-c++-cpp-output"},
-  {".s", "assembler"},
+  {".i",    "cpp-output"              },
+  {".ii",   "c++-cpp-output"          },
+  {".mi",   "objective-c-cpp-output"  },
+  {".mii",  "objective-c++-cpp-output"},
+  {".s",    "assembler"               },
   // Header file (for precompilation):
-  {".h", "c-header"},
-  {".H", "c++-header"},
-  {".h++", "c++-header"},
-  {".H++", "c++-header"},
-  {".hh", "c++-header"},
-  {".HH", "c++-header"},
-  {".hp", "c++-header"},
-  {".HP", "c++-header"},
-  {".hpp", "c++-header"},
-  {".HPP", "c++-header"},
-  {".hxx", "c++-header"},
-  {".HXX", "c++-header"},
-  {".tcc", "c++-header"},
-  {".TCC", "c++-header"},
-  {".cu", "cu"}, // Special case in language_for_file: "cuda" for Clang
-  {".hip", "hip"},
-  {nullptr, nullptr},
+  {".h",    "c-header"                },
+  {".H",    "c++-header"              },
+  {".h++",  "c++-header"              },
+  {".H++",  "c++-header"              },
+  {".hh",   "c++-header"              },
+  {".HH",   "c++-header"              },
+  {".hp",   "c++-header"              },
+  {".HP",   "c++-header"              },
+  {".hpp",  "c++-header"              },
+  {".HPP",  "c++-header"              },
+  {".hxx",  "c++-header"              },
+  {".HXX",  "c++-header"              },
+  {".tcc",  "c++-header"              },
+  {".TCC",  "c++-header"              },
+  {".cu",   "cu"                      }, // Special case in language_for_file: "cuda" for Clang
+  {".hip",  "hip"                     },
+  {nullptr, nullptr                   },
 };
 
 // Supported languages and corresponding preprocessed languages.
@@ -80,26 +80,26 @@ const struct
   const char* language;
   const char* p_language;
 } k_lang_p_lang_table[] = {
-  {"c", "cpp-output"},
-  {"cpp-output", "cpp-output"},
-  {"c-header", "cpp-output"},
-  {"c++", "c++-cpp-output"},
-  {"c++-cpp-output", "c++-cpp-output"},
-  {"c++-header", "c++-cpp-output"},
-  {"cu", "cpp-output"},   // NVCC
-  {"cuda", "cpp-output"}, // Clang
-  {"hip", "cpp-output"},
-  {"objective-c", "objective-c-cpp-output"},
-  {"objective-c-header", "objective-c-cpp-output"},
-  {"objc-cpp-output", "objective-c-cpp-output"},
-  {"objective-c-cpp-output", "objective-c-cpp-output"},
-  {"objective-c++", "objective-c++-cpp-output"},
-  {"objc++-cpp-output", "objective-c++-cpp-output"},
-  {"objective-c++-header", "objective-c++-cpp-output"},
+  {"c",                        "cpp-output"              },
+  {"cpp-output",               "cpp-output"              },
+  {"c-header",                 "cpp-output"              },
+  {"c++",                      "c++-cpp-output"          },
+  {"c++-cpp-output",           "c++-cpp-output"          },
+  {"c++-header",               "c++-cpp-output"          },
+  {"cu",                       "cpp-output"              }, // NVCC
+  {"cuda",                     "cpp-output"              }, // Clang
+  {"hip",                      "cpp-output"              },
+  {"objective-c",              "objective-c-cpp-output"  },
+  {"objective-c-header",       "objective-c-cpp-output"  },
+  {"objc-cpp-output",          "objective-c-cpp-output"  },
+  {"objective-c-cpp-output",   "objective-c-cpp-output"  },
+  {"objective-c++",            "objective-c++-cpp-output"},
+  {"objc++-cpp-output",        "objective-c++-cpp-output"},
+  {"objective-c++-header",     "objective-c++-cpp-output"},
   {"objective-c++-cpp-output", "objective-c++-cpp-output"},
-  {"assembler-with-cpp", "assembler"},
-  {"assembler", "assembler"},
-  {nullptr, nullptr},
+  {"assembler-with-cpp",       "assembler"               },
+  {"assembler",                "assembler"               },
+  {nullptr,                    nullptr                   },
 };
 
 } // namespace

diff --git a/src/ccache/signalhandler.cpp b/src/ccache/signalhandler.cpp
index 3b437e3e446d15a21c9ef704a5cc4943e1c0dd0b..6f3a0bb683249440da6da36e8d2ad2d035b2b3cd 100644 (file)
--- a/src/ccache/signalhandler.cpp
+++ b/src/ccache/signalhandler.cpp
@@ -64,7 +64,8 @@ deregister_signal_handler(int signum)
 
 } // namespace
 
-SignalHandler::SignalHandler(Context& ctx) : m_ctx(ctx)
+SignalHandler::SignalHandler(Context& ctx)
+  : m_ctx(ctx)
 {
   ASSERT(!g_the_signal_handler);
   g_the_signal_handler = this;

diff --git a/src/ccache/storage/local/localstorage.cpp b/src/ccache/storage/local/localstorage.cpp
index 29692b975f099d9a4900646f1dda3cc4be8356cc..2e97762f35c1a3d0339f408858d204985eb17715 100644 (file)
--- a/src/ccache/storage/local/localstorage.cpp
+++ b/src/ccache/storage/local/localstorage.cpp
@@ -442,7 +442,8 @@ file_type_from_path(const fs::path& path)
   }
 }
 
-LocalStorage::LocalStorage(const Config& config) : m_config(config)
+LocalStorage::LocalStorage(const Config& config)
+  : m_config(config)
 {
 }
 

diff --git a/src/ccache/storage/local/statsfile.cpp b/src/ccache/storage/local/statsfile.cpp
index 9ce023fd45eedde28515d1085561dfb18598051b..07d1450715a600797cd38c8c1fcb38787ceb9f73 100644 (file)
--- a/src/ccache/storage/local/statsfile.cpp
+++ b/src/ccache/storage/local/statsfile.cpp
@@ -30,7 +30,8 @@ namespace fs = util::filesystem;
 
 namespace storage::local {
 
-StatsFile::StatsFile(const fs::path& path) : m_path(path)
+StatsFile::StatsFile(const fs::path& path)
+  : m_path(path)
 {
 }
 

diff --git a/src/ccache/storage/storage.cpp b/src/ccache/storage/storage.cpp
index 702d7126aa33b3af227fbfa2545e66e1663fa2d9..e3c140ffedecdbb6fa7659c17f5a4ac57abd2239 100644 (file)
--- a/src/ccache/storage/storage.cpp
+++ b/src/ccache/storage/storage.cpp
@@ -53,12 +53,12 @@ namespace storage {
 const std::unordered_map<std::string /*scheme*/,
                          std::shared_ptr<remote::RemoteStorage>>
   k_remote_storage_implementations = {
-    {"file", std::make_shared<remote::FileStorage>()},
+    {"file",       std::make_shared<remote::FileStorage>() },
 #ifdef HAVE_HTTP_STORAGE_BACKEND
-    {"http", std::make_shared<remote::HttpStorage>()},
+    {"http",       std::make_shared<remote::HttpStorage>() },
 #endif
 #ifdef HAVE_REDIS_STORAGE_BACKEND
-    {"redis", std::make_shared<remote::RedisStorage>()},
+    {"redis",      std::make_shared<remote::RedisStorage>()},
     {"redis+unix", std::make_shared<remote::RedisStorage>()},
 #endif
 };
@@ -245,7 +245,9 @@ get_storage(const std::string& scheme)
   }
 }
 
-Storage::Storage(const Config& config) : local(config), m_config(config)
+Storage::Storage(const Config& config)
+  : local(config),
+    m_config(config)
 {
 }
 

diff --git a/src/ccache/util/bitset.hpp b/src/ccache/util/bitset.hpp
index 9cf146dcbf4f79ab2064930a3e23351b6c14c8f1..5006af4b7d1af0bd08211f39b33519afdf840fbc 100644 (file)
--- a/src/ccache/util/bitset.hpp
+++ b/src/ccache/util/bitset.hpp
@@ -54,7 +54,8 @@ inline BitSet<T>::BitSet(T value)
 }
 
 template<typename T>
-inline BitSet<T>::BitSet(const BitSet& set) : m_value(set.m_value)
+inline BitSet<T>::BitSet(const BitSet& set)
+  : m_value(set.m_value)
 {
 }
 

diff --git a/src/ccache/util/defer.hpp b/src/ccache/util/defer.hpp
index 739a6df4eb6d43102537ba3a544d42ed8ef09f68..e04898f12b4f1036efd5a343d88204492fac2830 100644 (file)
--- a/src/ccache/util/defer.hpp
+++ b/src/ccache/util/defer.hpp
@@ -37,7 +37,8 @@ private:
   std::function<void()> m_func;
 };
 
-inline Deferrer::Deferrer(std::function<void()> func) : m_func(func)
+inline Deferrer::Deferrer(std::function<void()> func)
+  : m_func(func)
 {
 }
 

diff --git a/src/ccache/util/fd.hpp b/src/ccache/util/fd.hpp
index b7a3b3e9949ae8b4b564fc2d6f170ff8400f127c..79ffe887ead551547b05462c3cf12277ea42419a 100644 (file)
--- a/src/ccache/util/fd.hpp
+++ b/src/ccache/util/fd.hpp
@@ -53,11 +53,13 @@ private:
   int m_fd = -1;
 };
 
-inline Fd::Fd(int fd) : m_fd(fd)
+inline Fd::Fd(int fd)
+  : m_fd(fd)
 {
 }
 
-inline Fd::Fd(Fd&& other_fd) noexcept : m_fd(other_fd.release())
+inline Fd::Fd(Fd&& other_fd) noexcept
+  : m_fd(other_fd.release())
 {
 }
 

diff --git a/src/ccache/util/filelock.cpp b/src/ccache/util/filelock.cpp
index 379afa5ef27ebfd49113e8ffa8d607b8fd9d9e10..04abcc52216de68ee8113203a223b27049076852 100644 (file)
--- a/src/ccache/util/filelock.cpp
+++ b/src/ccache/util/filelock.cpp
@@ -32,7 +32,8 @@
 
 namespace util {
 
-FileLock::FileLock(int fd) : m_fd(fd)
+FileLock::FileLock(int fd)
+  : m_fd(fd)
 {
 }
 

diff --git a/src/ccache/util/filestream.hpp b/src/ccache/util/filestream.hpp
index cddf0ccd1d1c14e36a5352a7b1c8325252eb98ba..f5f39a25820db1563b14dfc3139ead388ed4aeef 100644 (file)
--- a/src/ccache/util/filestream.hpp
+++ b/src/ccache/util/filestream.hpp
@@ -48,7 +48,9 @@ private:
   bool m_owned = false;
 };
 
-inline FileStream::FileStream(FILE* const file) : m_file(file), m_owned(false)
+inline FileStream::FileStream(FILE* const file)
+  : m_file(file),
+    m_owned(false)
 {
 }
 

diff --git a/src/ccache/util/logging.cpp b/src/ccache/util/logging.cpp
index b9118661d58936df127707772a61888aa804425f..bb11e279ba43b908db27dddbd008450ec24312b9 100644 (file)
--- a/src/ccache/util/logging.cpp
+++ b/src/ccache/util/logging.cpp
@@ -175,7 +175,8 @@ dump_log(const fs::path& path)
   }
 }
 
-BulkLogger::BulkLogger() : m_file_lock(logfile ? fileno(*logfile) : -1)
+BulkLogger::BulkLogger()
+  : m_file_lock(logfile ? fileno(*logfile) : -1)
 {
   if (logfile) {
     std::ignore = m_file_lock.acquire(); // Garbled logs are better than no logs

diff --git a/src/ccache/util/texttable.cpp b/src/ccache/util/texttable.cpp
index 55cd37eecead4c0fd11556699cc44262433c1b04..8da4996210c13d245bc1cf4c80f95647e770759d 100644 (file)
--- a/src/ccache/util/texttable.cpp
+++ b/src/ccache/util/texttable.cpp
@@ -116,15 +116,18 @@ TextTable::render() const
   return result;
 }
 
-TextTable::Cell::Cell(const std::string& text) : m_text(text)
+TextTable::Cell::Cell(const std::string& text)
+  : m_text(text)
 {
 }
 
-TextTable::Cell::Cell(std::string_view text) : Cell(std::string(text))
+TextTable::Cell::Cell(std::string_view text)
+  : Cell(std::string(text))
 {
 }
 
-TextTable::Cell::Cell(const char* text) : Cell(std::string(text))
+TextTable::Cell::Cell(const char* text)
+  : Cell(std::string(text))
 {
 }
 

diff --git a/src/ccache/util/timepoint.hpp b/src/ccache/util/timepoint.hpp
index a9b53cec1b71add7f58494df8ad73e5152e169f8..d41f0fc67184202194797e00b647c2d56e685d4e 100644 (file)
--- a/src/ccache/util/timepoint.hpp
+++ b/src/ccache/util/timepoint.hpp
@@ -66,7 +66,8 @@ inline TimePoint::TimePoint(int64_t sec, int64_t nsec)
 {
 }
 
-inline TimePoint::TimePoint(const TimePoint& other) : m_ns(other.m_ns)
+inline TimePoint::TimePoint(const TimePoint& other)
+  : m_ns(other.m_ns)
 {
 }
 

diff --git a/src/ccache/util/timer.hpp b/src/ccache/util/timer.hpp
index afbf7ab024854c781994871bcad1685e671e8c13..a74d1dced662a03aa1436a2872d5da1d7cb689ae 100644 (file)
--- a/src/ccache/util/timer.hpp
+++ b/src/ccache/util/timer.hpp
@@ -33,7 +33,8 @@ private:
   std::chrono::steady_clock::time_point m_start;
 };
 
-inline Timer::Timer() : m_start(std::chrono::steady_clock::now())
+inline Timer::Timer()
+  : m_start(std::chrono::steady_clock::now())
 {
 }
 

diff --git a/src/ccache/util/xxh3_128.hpp b/src/ccache/util/xxh3_128.hpp
index 0215dc35f627900b56000ca0adc4661be9341d5a..4d816603e6a974ade393f10defca9b2bd052277d 100644 (file)
--- a/src/ccache/util/xxh3_128.hpp
+++ b/src/ccache/util/xxh3_128.hpp
@@ -49,7 +49,8 @@ private:
   XXH3_state_t* m_state;
 };
 
-inline XXH3_128::XXH3_128() : m_state(XXH3_createState())
+inline XXH3_128::XXH3_128()
+  : m_state(XXH3_createState())
 {
   reset();
 }

diff --git a/src/ccache/util/xxh3_64.hpp b/src/ccache/util/xxh3_64.hpp
index 1895759de32f075dd1918c8840b917028b6e05ca..72e91887ebb8d914d84e3185dc72ac6b90b4ed2a 100644 (file)
--- a/src/ccache/util/xxh3_64.hpp
+++ b/src/ccache/util/xxh3_64.hpp
@@ -42,7 +42,8 @@ private:
   XXH3_state_t* m_state;
 };
 
-inline XXH3_64::XXH3_64() : m_state(XXH3_createState())
+inline XXH3_64::XXH3_64()
+  : m_state(XXH3_createState())
 {
   reset();
 }

diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp
index b8f51ae3b2f9bc74c5cd56dfa8d9e71b2a60d85f..68687ec5ef2d53e847e3180c3f339b507b57e7ee 100644 (file)
--- a/unittest/test_argprocessing.cpp
+++ b/unittest/test_argprocessing.cpp
@@ -344,7 +344,9 @@ TEST_CASE(
   TestContext test_context;
 
   Context ctx;
-  ctx.config.update_from_map({{"sloppiness", "ivfsoverlay"}});
+  ctx.config.update_from_map({
+    {"sloppiness", "ivfsoverlay"}
+  });
 
   util::write_file("foo.c", "");
   ctx.config.set_base_dir(get_root());
@@ -365,7 +367,9 @@ TEST_CASE(
   TestContext test_context;
 
   Context ctx;
-  ctx.config.update_from_map({{"sloppiness", "modules"}});
+  ctx.config.update_from_map({
+    {"sloppiness", "modules"}
+  });
 
   util::write_file("foo.c", "");
   ctx.config.set_base_dir(get_root());
@@ -389,7 +393,9 @@ TEST_CASE(
   TestContext test_context;
 
   Context ctx;
-  ctx.config.update_from_map({{"sloppiness", "modules"}});
+  ctx.config.update_from_map({
+    {"sloppiness", "modules"}
+  });
 
   util::write_file("foo.c", "");
   ctx.config.set_base_dir(get_root());
@@ -836,7 +842,9 @@ TEST_CASE("MSVC PCH options")
   }
 
   util::write_file("pch.cpp.pch", "");
-  ctx.config.update_from_map({{"sloppiness", "pch_defines,time_macros"}});
+  ctx.config.update_from_map({
+    {"sloppiness", "pch_defines,time_macros"}
+  });
 
   SUBCASE("Consume PCH")
   {
@@ -879,7 +887,9 @@ TEST_CASE("MSVC PCH options with empty -Yc")
   }
 
   util::write_file("pch.cpp.pch", "");
-  ctx.config.update_from_map({{"sloppiness", "pch_defines,time_macros"}});
+  ctx.config.update_from_map({
+    {"sloppiness", "pch_defines,time_macros"}
+  });
 
   SUBCASE("Consume PCH")
   {
@@ -919,7 +929,9 @@ TEST_CASE("MSVC PCH options with empty -Yc and without -Fp")
   }
 
   util::write_file("pch.pch", "");
-  ctx.config.update_from_map({{"sloppiness", "pch_defines,time_macros"}});
+  ctx.config.update_from_map({
+    {"sloppiness", "pch_defines,time_macros"}
+  });
 
   SUBCASE("Consume PCH")
   {
@@ -959,7 +971,9 @@ TEST_CASE("MSVC PCH options with empty -Yc and without -Fp and -Fo")
   }
 
   util::write_file("pch.pch", "");
-  ctx.config.update_from_map({{"sloppiness", "pch_defines,time_macros"}});
+  ctx.config.update_from_map({
+    {"sloppiness", "pch_defines,time_macros"}
+  });
 
   SUBCASE("Consume PCH")
   {

diff --git a/unittest/test_bsdmkstemp.cpp b/unittest/test_bsdmkstemp.cpp
index 01db172dc60ed9c17a758547eeb703cfdb74049b..91934a04211f2a9c17c503466de284d616986077 100644 (file)
--- a/unittest/test_bsdmkstemp.cpp
+++ b/unittest/test_bsdmkstemp.cpp
@@ -42,11 +42,13 @@ class ScopedHANDLE
 public:
   ScopedHANDLE() = default;
 
-  explicit ScopedHANDLE(HANDLE handle) : m_handle(handle)
+  explicit ScopedHANDLE(HANDLE handle)
+    : m_handle(handle)
   {
   }
 
-  ScopedHANDLE(ScopedHANDLE&& other) : ScopedHANDLE(other.release())
+  ScopedHANDLE(ScopedHANDLE&& other)
+    : ScopedHANDLE(other.release())
   {
   }