Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81af4365 authored by Bart Van Assche's avatar Bart Van Assche Committed by Automerger Merge Worker
Browse files

Merge "init: Simplify struct BuiltinArguments" am: 95465fe7 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2451825



Change-Id: Iae3bcd1356e1504de0d1348dbce2371fa52e454a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a15e7ab8 95465fe7

init/action.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace init { 


Result<void> RunBuiltinFunction(const BuiltinFunction& function,

                                const std::vector<std::string>& args, const std::string& context) {

    auto builtin_arguments = BuiltinArguments(context);

    BuiltinArguments builtin_arguments{.context = context};



    builtin_arguments.args.resize(args.size());

    builtin_arguments.args[0] = args[0];
@@ -69,7 +69,7 @@ Result<void> Command::InvokeFunc(Subcontext* subcontext) const { 
}



Result<void> Command::CheckCommand() const {

    auto builtin_arguments = BuiltinArguments("host_init_verifier");

    BuiltinArguments builtin_arguments{.context = "host_init_verifier"};



    builtin_arguments.args.resize(args_.size());

    builtin_arguments.args[0] = args_[0];

init/builtin_arguments.h

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ namespace android { 
namespace init {



struct BuiltinArguments {

    BuiltinArguments(const std::string& context) : context(context) {}

    BuiltinArguments(std::vector<std::string> args, const std::string& context)

        : args(std::move(args)), context(context) {}



    const std::string& operator[](std::size_t i) const { return args[i]; }

    auto begin() const { return args.begin(); }

    auto end() const { return args.end(); }

init/builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ static Result<void> do_restorecon(const BuiltinArguments& args) { 
static Result<void> do_restorecon_recursive(const BuiltinArguments& args) {

    std::vector<std::string> non_const_args(args.args);

    non_const_args.insert(std::next(non_const_args.begin()), "--recursive");

    return do_restorecon({std::move(non_const_args), args.context});

    return do_restorecon({.args = std::move(non_const_args), .context = args.context});

}



static Result<void> do_loglevel(const BuiltinArguments& args) {

init/check_builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ Result<void> check_exec_background(const BuiltinArguments& args) { 
}



Result<void> check_exec_reboot_on_failure(const BuiltinArguments& args) {

    BuiltinArguments remaining_args(args.context);

    BuiltinArguments remaining_args{.context = args.context};



    remaining_args.args = std::vector<std::string>(args.begin() + 1, args.end());

    remaining_args.args[0] = args[0];