From c04840697d22f817f3aa4413571ebe0dfc9677e3 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Sat, 22 Feb 2020 12:55:22 +0100 Subject: [PATCH] Rename cc_process_args to process_args --- src/ccache.cpp | 20 ++++----- src/ccache.hpp | 10 ++--- unittest/test_argument_processing.cpp | 58 +++++++++++++-------------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/ccache.cpp b/src/ccache.cpp index b5f9f33b2..0cc3b555c 100644 --- a/src/ccache.cpp +++ b/src/ccache.cpp @@ -2198,11 +2198,11 @@ detect_pch(Context& ctx, const char* option, const char* arg, bool* found_pch) // Returns nullopt on success, otherwise the statistics counter that should be // incremented. optional -cc_process_args(Context& ctx, - struct args* args, - struct args** preprocessor_args, - struct args** extra_args_to_hash, - struct args** compiler_args) +process_args(Context& ctx, + struct args* args, + struct args** preprocessor_args, + struct args** extra_args_to_hash, + struct args** compiler_args) { ArgsInfo& args_info = ctx.args_info; Config& config = ctx.config; @@ -3595,11 +3595,11 @@ do_cache_compilation(Context& ctx, char* argv[]) struct args* compiler_args; MTR_BEGIN("main", "process_args"); - auto error = cc_process_args(ctx, - ctx.orig_args, - &preprocessor_args, - &extra_args_to_hash, - &compiler_args); + auto error = process_args(ctx, + ctx.orig_args, + &preprocessor_args, + &extra_args_to_hash, + &compiler_args); if (error) { failed(*error); } diff --git a/src/ccache.hpp b/src/ccache.hpp index 2e1c62070..c114c6490 100644 --- a/src/ccache.hpp +++ b/src/ccache.hpp @@ -60,9 +60,9 @@ enum class GuessedCompiler { clang, gcc, nvcc, pump, unknown }; void block_signals(); void unblock_signals(); -nonstd::optional cc_process_args(Context& ctx, - struct args* args, - struct args** preprocessor_args, - struct args** extra_args_to_hash, - struct args** compiler_args); +nonstd::optional process_args(Context& ctx, + struct args* args, + struct args** preprocessor_args, + struct args** extra_args_to_hash, + struct args** compiler_args); bool is_precompiled_header(const char* path); diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp index f4dbcef54..bf0708999 100644 --- a/unittest/test_argument_processing.cpp +++ b/unittest/test_argument_processing.cpp @@ -74,7 +74,7 @@ TEST(dash_E_should_result_in_called_for_preprocessing) struct args *preprocessed, *compiler; create_file("foo.c", ""); - CHECK(cc_process_args(ctx, orig, &preprocessed, NULL, &compiler) + CHECK(process_args(ctx, orig, &preprocessed, NULL, &compiler) == STATS_PREPROCESSING); args_free(orig); @@ -88,7 +88,7 @@ TEST(dash_M_should_be_unsupported) struct args *preprocessed, *compiler; create_file("foo.c", ""); - CHECK(cc_process_args(ctx, orig, &preprocessed, NULL, &compiler) + CHECK(process_args(ctx, orig, &preprocessed, NULL, &compiler) == STATS_UNSUPPORTED_OPTION); args_free(orig); @@ -113,7 +113,7 @@ TEST(dependency_args_to_preprocessor_if_run_second_cpp_is_false) create_file("foo.c", ""); ctx.config.set_run_second_cpp(false); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -139,7 +139,7 @@ TEST(dependency_args_to_compiler_if_run_second_cpp_is_true) struct args* act_cc = NULL; create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -172,7 +172,7 @@ TEST(cpp_only_args_to_preprocessor_if_run_second_cpp_is_false) create_file("foo.c", ""); ctx.config.set_run_second_cpp(false); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -204,7 +204,7 @@ TEST(cpp_only_args_to_preprocessor_and_compiler_if_run_second_cpp_is_true) struct args* act_cc = NULL; create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -228,7 +228,7 @@ TEST(dependency_args_that_take_an_argument_should_not_require_space_delimiter) struct args* act_cc = NULL; create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -250,7 +250,7 @@ TEST(MQ_flag_should_not_be_added_if_run_second_cpp_is_true) struct args* act_cc = NULL; create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -273,7 +273,7 @@ TEST(MQ_flag_should_be_added_if_run_second_cpp_is_false) create_file("foo.c", ""); ctx.config.set_run_second_cpp(false); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -296,7 +296,7 @@ TEST(MF_should_be_added_if_run_second_cpp_is_false) create_file("foo.c", ""); ctx.config.set_run_second_cpp(false); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -318,7 +318,7 @@ TEST(MF_should_not_be_added_if_run_second_cpp_is_true) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -340,7 +340,7 @@ TEST(equal_sign_after_MF_should_be_removed) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -365,7 +365,7 @@ TEST(sysroot_should_be_rewritten_if_basedir_is_used) orig = args_init_from_string(arg_string); free(arg_string); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_STR_EQ(act_cpp->argv[1], "--sysroot=./foo/bar"); args_free(orig); @@ -389,7 +389,7 @@ TEST(sysroot_with_separate_argument_should_be_rewritten_if_basedir_is_used) orig = args_init_from_string(arg_string); free(arg_string); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_STR_EQ(act_cpp->argv[1], "--sysroot"); CHECK_STR_EQ(act_cpp->argv[2], "./foo"); @@ -413,7 +413,7 @@ TEST(MF_flag_with_immediate_argument_should_work_as_last_argument) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -438,7 +438,7 @@ TEST(MT_flag_with_immediate_argument_should_work_as_last_argument) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -463,7 +463,7 @@ TEST(MQ_flag_with_immediate_argument_should_work_as_last_argument) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -487,7 +487,7 @@ TEST(MQ_flag_without_immediate_argument_should_not_add_MQobj) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -511,7 +511,7 @@ TEST(MT_flag_without_immediate_argument_should_not_add_MTobj) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -535,7 +535,7 @@ TEST(MQ_flag_with_immediate_argument_should_not_add_MQobj) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -559,7 +559,7 @@ TEST(MT_flag_with_immediate_argument_should_not_add_MQobj) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -592,7 +592,7 @@ TEST(fprofile_flag_with_existing_dir_should_be_rewritten_to_real_path) args_add(exp_cc, "-c"); free(s); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -617,7 +617,7 @@ TEST(fprofile_flag_with_nonexistent_dir_should_not_be_rewritten) create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -641,7 +641,7 @@ TEST(isystem_flag_with_separate_arg_should_be_rewritten_if_basedir_is_used) orig = args_init_from_string(arg_string); free(arg_string); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_STR_EQ("./foo", act_cpp->argv[2]); args_free(orig); @@ -668,7 +668,7 @@ TEST(isystem_flag_with_concat_arg_should_be_rewritten_if_basedir_is_used) orig = args_init_from_string(arg_string); free(arg_string); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_STR_EQ("-isystem./foo", act_cpp->argv[1]); free(cwd); @@ -696,7 +696,7 @@ TEST(I_flag_with_concat_arg_should_be_rewritten_if_basedir_is_used) orig = args_init_from_string(arg_string); free(arg_string); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_STR_EQ("-I./foo", act_cpp->argv[1]); free(cwd); @@ -718,7 +718,7 @@ TEST(debug_flag_order_with_known_option_first) struct args* act_cc = NULL; create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -739,7 +739,7 @@ TEST(debug_flag_order_with_known_option_last) struct args* act_cc = NULL; create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); @@ -763,7 +763,7 @@ TEST(options_not_to_be_passed_to_the_preprocesor) struct args* act_cc = NULL; create_file("foo.c", ""); - CHECK(!cc_process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); + CHECK(!process_args(ctx, orig, &act_cpp, &act_extra, &act_cc)); CHECK_ARGS_EQ_FREE12(exp_cpp, act_cpp); CHECK_ARGS_EQ_FREE12(exp_extra, act_extra); CHECK_ARGS_EQ_FREE12(exp_cc, act_cc); -- 2.47.2