From 0a804cdfc90e4be21343f0cdf6eee39c468d9d06 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Thu, 24 Jul 2025 10:58:03 +0200 Subject: [PATCH] refactor: Improve variable name in win32execute --- src/ccache/execute.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ccache/execute.cpp b/src/ccache/execute.cpp index 7b1b7d23..96a5f60c 100644 --- a/src/ccache/execute.cpp +++ b/src/ccache/execute.cpp @@ -221,7 +221,7 @@ win32execute(const char* const* argv, } } - std::string args = util::format_argv_as_win32_command_string(argv); + std::string commandline = util::format_argv_as_win32_command_string(argv); fs::path tmp_file_path; DEFER([&] { @@ -230,22 +230,22 @@ win32execute(const char* const* argv, } }); - if (args.length() > 8192) { + if (commandline.length() > 8192) { auto tmp_file = util::value_or_throw( util::TemporaryFile::create(FMT("{}/cmd_args", temp_dir))); LOG("Arguments from {}", tmp_file.path); - args = util::format_argv_as_win32_command_string(argv + 1, true); - util::write_fd(*tmp_file.fd, args.data(), args.length()); - args = FMT(R"("{}" "@{}")", argv[0], tmp_file.path); + commandline = util::format_argv_as_win32_command_string(argv + 1, true); + util::write_fd(*tmp_file.fd, commandline.data(), commandline.length()); + commandline = FMT(R"("{}" "@{}")", argv[0], tmp_file.path); tmp_file_path = tmp_file.path; } std::string sh = win32getshell(argv[0]); if (!sh.empty()) { - args = FMT(R"("{}" {})", sh, args); + commandline = FMT(R"("{}" {})", sh, commandline); } BOOL ret = CreateProcess(nullptr, - const_cast(args.c_str()), + const_cast(commandline.c_str()), nullptr, nullptr, 1, -- 2.47.2