diff --git a/init/action.cpp b/init/action.cpp index a1695912e..8cf7645fb 100644 --- a/init/action.cpp +++ b/init/action.cpp @@ -95,7 +95,7 @@ Result Action::AddCommand(std::vector&& args, int line) { } void Action::AddCommand(BuiltinFunction f, std::vector&& args, int line) { - commands_.emplace_back(f, false, std::move(args), line); + commands_.emplace_back(std::move(f), false, std::move(args), line); } std::size_t Action::NumCommands() const { diff --git a/init/action_manager.cpp b/init/action_manager.cpp index 985b8adf5..541c8f21d 100644 --- a/init/action_manager.cpp +++ b/init/action_manager.cpp @@ -47,7 +47,7 @@ void ActionManager::QueueAllPropertyActions() { void ActionManager::QueueBuiltinAction(BuiltinFunction func, const std::string& name) { auto action = std::make_unique(true, nullptr, "", 0, name, std::map{}); - action->AddCommand(func, {name}, 0); + action->AddCommand(std::move(func), {name}, 0); event_queue_.emplace(action.get()); actions_.emplace_back(std::move(action)); diff --git a/init/devices.h b/init/devices.h index 9d39eaace..442c53f95 100644 --- a/init/devices.h +++ b/init/devices.h @@ -84,9 +84,9 @@ class Subsystem { }; Subsystem() {} - Subsystem(const std::string& name) : name_(name) {} - Subsystem(const std::string& name, DevnameSource source, const std::string& dir_name) - : name_(name), devname_source_(source), dir_name_(dir_name) {} + Subsystem(std::string name) : name_(std::move(name)) {} + Subsystem(std::string name, DevnameSource source, std::string dir_name) + : name_(std::move(name)), devname_source_(source), dir_name_(std::move(dir_name)) {} // Returns the full path for a uevent of a device that is a member of this subsystem, // according to the rules parsed from ueventd.rc diff --git a/init/devices_test.cpp b/init/devices_test.cpp index 3e7c1a840..c408bc130 100644 --- a/init/devices_test.cpp +++ b/init/devices_test.cpp @@ -30,7 +30,7 @@ namespace init { class DeviceHandlerTester { public: void TestGetSymlinks(const std::string& platform_device, const Uevent& uevent, - const std::vector expected_links) { + const std::vector& expected_links) { TemporaryDir fake_sys_root; device_handler_.sysfs_mount_point_ = fake_sys_root.path; diff --git a/init/keychords.cpp b/init/keychords.cpp index d0ca3e709..5f2682be5 100644 --- a/init/keychords.cpp +++ b/init/keychords.cpp @@ -285,7 +285,7 @@ void Keychords::Register(const std::vector& keycodes) { void Keychords::Start(Epoll* epoll, std::function&)> handler) { epoll_ = epoll; - handler_ = handler; + handler_ = std::move(handler); if (entries_.size()) GeteventOpenDevice(); } diff --git a/init/mount_handler.cpp b/init/mount_handler.cpp index b0b63c585..791a0198f 100644 --- a/init/mount_handler.cpp +++ b/init/mount_handler.cpp @@ -140,11 +140,11 @@ void MountHandler::MountHandlerFunction() { } } free(buf); - for (auto entry : untouched) { + for (auto& entry : untouched) { SetMountProperty(entry, false); mounts_.erase(entry); } - for (auto entry : touched) { + for (auto& entry : touched) { SetMountProperty(entry, true); mounts_.emplace(std::move(entry)); } diff --git a/init/parser.cpp b/init/parser.cpp index bbfbdc6b8..6ab61cb87 100644 --- a/init/parser.cpp +++ b/init/parser.cpp @@ -37,7 +37,7 @@ void Parser::AddSectionParser(const std::string& name, std::unique_ptr MixHwrngIntoLinuxRngAction(const BuiltinArguments&) { return {}; } -static bool SetHighestAvailableOptionValue(std::string path, int min, int max) { +static bool SetHighestAvailableOptionValue(const std::string& path, int min, int max) { std::ifstream inf(path, std::fstream::in); if (!inf) { LOG(ERROR) << "Cannot open for reading: " << path; diff --git a/init/test_function_map.h b/init/test_function_map.h index 293f1f9b4..466836ce3 100644 --- a/init/test_function_map.h +++ b/init/test_function_map.h @@ -30,17 +30,17 @@ class TestFunctionMap : public KeywordFunctionMap { public: // Helper for argument-less functions using BuiltinFunctionNoArgs = std::function; - void Add(const std::string& name, const BuiltinFunctionNoArgs function) { - Add(name, 0, 0, false, [function](const BuiltinArguments&) { - function(); + void Add(const std::string& name, BuiltinFunctionNoArgs function) { + Add(name, 0, 0, false, [f = std::move(function)](const BuiltinArguments&) { + f(); return Result{}; }); } void Add(const std::string& name, std::size_t min_parameters, std::size_t max_parameters, - bool run_in_subcontext, const BuiltinFunction function) { - builtin_functions_[name] = - make_tuple(min_parameters, max_parameters, make_pair(run_in_subcontext, function)); + bool run_in_subcontext, BuiltinFunction function) { + builtin_functions_[name] = make_tuple(min_parameters, max_parameters, + make_pair(run_in_subcontext, std::move(function))); } private: diff --git a/init/ueventd.cpp b/init/ueventd.cpp index 3b9de0f62..8b2cf6225 100644 --- a/init/ueventd.cpp +++ b/init/ueventd.cpp @@ -146,7 +146,7 @@ void ColdBoot::UeventHandlerMain(unsigned int process_num, unsigned int total_pr void ColdBoot::RegenerateUevents() { uevent_listener_.RegenerateUevents([this](const Uevent& uevent) { - uevent_queue_.emplace_back(std::move(uevent)); + uevent_queue_.emplace_back(uevent); return ListenerAction::kContinue; }); }