From: Joel Rosdahl Date: Sat, 19 Jul 2025 11:08:52 +0000 (+0200) Subject: chore: Improve code style X-Git-Tag: v4.12~79 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88e1967fffab8e95e0826453fc60f9b35b75bca3;p=thirdparty%2Fccache.git chore: Improve code style --- diff --git a/.clang-format b/.clang-format index 33be928c..ce152731 100644 --- 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 19cf7839..d1dcf16f 100644 --- a/src/ccache/args.cpp +++ b/src/ccache/args.cpp @@ -25,7 +25,8 @@ #include #include -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 65baf609..c820b683 100644 --- a/src/ccache/ccache.cpp +++ b/src/ccache/ccache.cpp @@ -135,7 +135,8 @@ private: std::optional 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 dd9cceca..aca1609e 100644 --- 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 963202ef..66b89655 100644 --- a/src/ccache/config.cpp +++ b/src/ccache/config.cpp @@ -130,102 +130,102 @@ struct ConfigKeyTableEntry const std::unordered_map 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 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 ab48ceab..d5013280 100644 --- 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(util::TemporaryFile::create(path)); diff --git a/src/ccache/core/cacheentry.cpp b/src/ccache/core/cacheentry.cpp index 6b86aa32..805fd8ab 100644 --- 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 data) : m_header(data) +CacheEntry::CacheEntry(nonstd::span 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 b3119082..d0d2a5f9 100644 --- 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(util::value_or_throw(util::parse_unsigned( arg, 1, std::numeric_limits::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 66d9750a..bd046069 100644 --- 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 data) : m_data(data) +Deserializer::Deserializer(nonstd::span data) + : m_data(data) { } diff --git a/src/ccache/core/resultinspector.cpp b/src/ccache/core/resultinspector.cpp index 62fc6259..ab810360 100644 --- 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 7d849f25..0093d46b 100644 --- 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 41db79a4..ff068ea1 100644 --- 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 3b437e3e..6f3a0bb6 100644 --- 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 29692b97..2e97762f 100644 --- 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 9ce023fd..07d14507 100644 --- 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 702d7126..e3c140ff 100644 --- a/src/ccache/storage/storage.cpp +++ b/src/ccache/storage/storage.cpp @@ -53,12 +53,12 @@ namespace storage { const std::unordered_map> k_remote_storage_implementations = { - {"file", std::make_shared()}, + {"file", std::make_shared() }, #ifdef HAVE_HTTP_STORAGE_BACKEND - {"http", std::make_shared()}, + {"http", std::make_shared() }, #endif #ifdef HAVE_REDIS_STORAGE_BACKEND - {"redis", std::make_shared()}, + {"redis", std::make_shared()}, {"redis+unix", std::make_shared()}, #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 9cf146dc..5006af4b 100644 --- a/src/ccache/util/bitset.hpp +++ b/src/ccache/util/bitset.hpp @@ -54,7 +54,8 @@ inline BitSet::BitSet(T value) } template -inline BitSet::BitSet(const BitSet& set) : m_value(set.m_value) +inline BitSet::BitSet(const BitSet& set) + : m_value(set.m_value) { } diff --git a/src/ccache/util/defer.hpp b/src/ccache/util/defer.hpp index 739a6df4..e04898f1 100644 --- a/src/ccache/util/defer.hpp +++ b/src/ccache/util/defer.hpp @@ -37,7 +37,8 @@ private: std::function m_func; }; -inline Deferrer::Deferrer(std::function func) : m_func(func) +inline Deferrer::Deferrer(std::function func) + : m_func(func) { } diff --git a/src/ccache/util/fd.hpp b/src/ccache/util/fd.hpp index b7a3b3e9..79ffe887 100644 --- 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 379afa5e..04abcc52 100644 --- 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 cddf0ccd..f5f39a25 100644 --- 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 b9118661..bb11e279 100644 --- 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 55cd37ee..8da49962 100644 --- 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 a9b53cec..d41f0fc6 100644 --- 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 afbf7ab0..a74d1dce 100644 --- 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 0215dc35..4d816603 100644 --- 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 1895759d..72e91887 100644 --- 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 b8f51ae3..68687ec5 100644 --- 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 01db172d..91934a04 100644 --- 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()) { }