From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 7 May 2020 16:57:15 +0000 (+0200)
Subject: Remove last usage of legacy args_init function
X-Git-Tag: v4.0~485
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6155e78d05369aa5cebc298d1faa020a26ac2e13;p=thirdparty%2Fccache.git

Remove last usage of legacy args_init function
---

diff --git a/src/ccache.cpp b/src/ccache.cpp
index ce3db0f1a..72168374e 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -2144,7 +2144,7 @@ set_up_config(Config& config)
 static void
 set_up_context(Context& ctx, int argc, const char* const* argv)
 {
-  ctx.orig_args = args_init(argc, argv);
+  ctx.orig_args = Args::from_argv(argc, argv);
   ctx.ignore_header_paths = Util::split_into_strings(
     ctx.config.ignore_headers_in_manifest(), PATH_DELIM);
 }
diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp
index 7e4f862c8..f481b01d3 100644
--- a/unittest/test_argument_processing.cpp
+++ b/unittest/test_argument_processing.cpp
@@ -105,7 +105,7 @@ TEST(dependency_args_to_preprocessor_if_run_second_cpp_is_false)
   " -Wp,-MMD,wpmmd -Wp,-MP -Wp,-MT,wpmt -Wp,-MQ,wpmq -Wp,-MF,wpf"
   ctx.orig_args = Args::from_string("cc " DEP_ARGS " -c foo.c -o foo.o");
   Args exp_cpp = args_init_from_string("cc " DEP_ARGS);
-  Args exp_extra = args_init(0, NULL);
+  Args exp_extra;
   Args exp_cc = args_init_from_string("cc -c");
 #undef DEP_ARGS
   Args act_cpp;
@@ -158,7 +158,7 @@ TEST(cpp_only_args_to_preprocessor_if_run_second_cpp_is_false)
   ctx.orig_args =
     Args::from_string("cc " CPP_ARGS " " DEP_ARGS " -c foo.c -o foo.o");
   Args exp_cpp = args_init_from_string("cc " CPP_ARGS " " DEP_ARGS);
-  Args exp_extra = args_init(0, NULL);
+  Args exp_extra;
   Args exp_cc = args_init_from_string("cc -c");
 #undef DEP_ARGS
 #undef CPP_ARGS
@@ -250,7 +250,7 @@ TEST(MQ_flag_should_be_added_if_run_second_cpp_is_false)
 
   ctx.orig_args = Args::from_string("cc -c -MD foo.c -MF foo.d -o foo.o");
   Args exp_cpp = args_init_from_string("cc -MD -MF foo.d -MQ foo.o");
-  Args exp_extra = args_init(0, NULL);
+  Args exp_extra;
   Args exp_cc = args_init_from_string("cc -c");
   Args act_cpp;
   Args act_extra;
@@ -270,7 +270,7 @@ TEST(MF_should_be_added_if_run_second_cpp_is_false)
 
   ctx.orig_args = Args::from_string("cc -c -MD foo.c -o foo.o");
   Args exp_cpp = args_init_from_string("cc -MD -MF foo.d -MQ foo.o");
-  Args exp_extra = args_init(0, NULL);
+  Args exp_extra;
   Args exp_cc = args_init_from_string("cc -c");
   Args act_cpp;
   Args act_extra;
@@ -585,7 +585,7 @@ TEST(debug_flag_order_with_known_option_first)
 
   ctx.orig_args = Args::from_string("cc -g1 -gsplit-dwarf foo.c -c");
   Args exp_cpp = args_init_from_string("cc -g1 -gsplit-dwarf");
-  Args exp_extra = args_init(0, NULL);
+  Args exp_extra;
   Args exp_cc = args_init_from_string("cc -g1 -gsplit-dwarf -c");
   Args act_cpp;
   Args act_extra;
@@ -604,7 +604,7 @@ TEST(debug_flag_order_with_known_option_last)
 
   ctx.orig_args = Args::from_string("cc -gsplit-dwarf -g1 foo.c -c");
   Args exp_cpp = args_init_from_string("cc -gsplit-dwarf -g1");
-  Args exp_extra = args_init(0, NULL);
+  Args exp_extra;
   Args exp_cc = args_init_from_string("cc -gsplit-dwarf -g1 -c");
   Args act_cpp;
   Args act_extra;