Skip to content

Commit c55cfba

Browse files
committed
Delete unused parameter
1 parent 088583b commit c55cfba

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CvdClearCommandHandler::CvdClearCommandHandler(
5353

5454
Result<void> CvdClearCommandHandler::Handle(const CommandRequest& request) {
5555
CF_EXPECT(CanHandle(request));
56-
CF_EXPECT(instance_manager_.CvdClear(request));
56+
CF_EXPECT(instance_manager_.CvdClear());
5757
return {};
5858
}
5959

base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class RemoveCvdCommandHandler : public CvdCommandHandler {
8484
return {};
8585
}
8686
auto config_path = CF_EXPECT(GetCuttlefishConfigPath(group.HomeDir()));
87-
CF_EXPECT(instance_manager_.IssueStopCommand(request, config_path, group));
87+
CF_EXPECT(instance_manager_.IssueStopCommand(config_path, group));
8888
return {};
8989
}
9090

base/cvd/cuttlefish/host/commands/cvd/cli/commands/reset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class CvdResetCommandHandler : public CvdCommandHandler {
142142
return {};
143143
}
144144

145-
instance_manager_.CvdClear(request);
145+
instance_manager_.CvdClear();
146146
// The instance database is obsolete now, clear it.
147147
auto instance_db_deleted = RemoveFile(InstanceDatabasePath());
148148
if (!instance_db_deleted) {

base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ Result<void> InstanceManager::UpdateInstanceGroup(
220220
}
221221

222222
Result<void> InstanceManager::IssueStopCommand(
223-
const CommandRequest& request, const std::string& config_file_path,
224-
LocalInstanceGroup& group) {
223+
const std::string& config_file_path, LocalInstanceGroup& group) {
225224
const auto stop_bin = CF_EXPECT(StopBin(group.HostArtifactsPath()));
226225
Command command(group.HostArtifactsPath() + "/bin/" + stop_bin);
227226
command.AddParameter("--clear_instance_dirs");
@@ -260,7 +259,7 @@ Result<void> InstanceManager::IssueStopCommand(
260259
return {};
261260
}
262261

263-
Result<void> InstanceManager::CvdClear(const CommandRequest& request) {
262+
Result<void> InstanceManager::CvdClear() {
264263
const std::string config_json_name =
265264
android::base::Basename(GetGlobalConfigFileLink());
266265
auto instance_groups =
@@ -270,7 +269,7 @@ Result<void> InstanceManager::CvdClear(const CommandRequest& request) {
270269
if (group.HasActiveInstances()) {
271270
auto config_path = GetCuttlefishConfigPath(group.HomeDir());
272271
if (config_path.ok()) {
273-
auto stop_result = IssueStopCommand(request, *config_path, group);
272+
auto stop_result = IssueStopCommand(*config_path, group);
274273
if (!stop_result.ok()) {
275274
LOG(ERROR) << stop_result.error().FormatForEnv();
276275
}

base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <vector>
2525

2626
#include "cuttlefish/common/libs/utils/result.h"
27-
#include "cuttlefish/host/commands/cvd/cli/command_request.h"
2827
#include "cuttlefish/host/commands/cvd/instances/instance_database.h"
2928
#include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
3029
#include "cuttlefish/host/commands/cvd/instances/instance_record.h"
@@ -58,7 +57,7 @@ class InstanceManager {
5857
Result<void> UpdateInstanceGroup(const LocalInstanceGroup& group);
5958
Result<bool> RemoveInstanceGroup(LocalInstanceGroup group);
6059

61-
Result<void> CvdClear(const CommandRequest&);
60+
Result<void> CvdClear();
6261

6362
Result<std::vector<LocalInstanceGroup>> FindGroups(
6463
const InstanceDatabase::Filter& filter) const;
@@ -68,8 +67,7 @@ class InstanceManager {
6867
Result<std::pair<LocalInstance, LocalInstanceGroup>> FindInstanceWithGroup(
6968
const InstanceDatabase::Filter& filter) const;
7069

71-
Result<void> IssueStopCommand(const CommandRequest& request,
72-
const std::string& config_file_path,
70+
Result<void> IssueStopCommand(const std::string& config_file_path,
7371
LocalInstanceGroup& group);
7472

7573
private:

0 commit comments

Comments
 (0)