Skip to content

Commit 018b630

Browse files
committed
Add missing CF_EXPECT calls
Without them, those functions are unrepresented in stack traces.
1 parent 3814599 commit 018b630

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ Result<bool> InstanceDatabase::RemoveInstanceGroup(
204204

205205
Result<std::vector<LocalInstanceGroup>> InstanceDatabase::FindGroups(
206206
const Filter& filter) const {
207-
return viewer_.WithSharedLock<std::vector<LocalInstanceGroup>>(
207+
return CF_EXPECT(viewer_.WithSharedLock<std::vector<LocalInstanceGroup>>(
208208
[&filter](const cvd::PersistentData& data) {
209209
return FindGroups(data, filter);
210-
});
210+
}));
211211
}
212212

213213
std::vector<LocalInstanceGroup> InstanceDatabase::FindGroups(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ InstanceManager::InstanceManager(InstanceLockFileManager& lock_manager,
102102
Result<std::pair<LocalInstance, LocalInstanceGroup>>
103103
InstanceManager::FindInstanceWithGroup(
104104
const InstanceDatabase::Filter& filter) const {
105-
return instance_db_.FindInstanceWithGroup(filter);
105+
return CF_EXPECT(instance_db_.FindInstanceWithGroup(filter));
106106
}
107107

108108
Result<bool> InstanceManager::HasInstanceGroups() const {
@@ -287,7 +287,7 @@ Result<void> InstanceManager::ResetAndClearInstanceDirs() {
287287

288288
Result<std::vector<LocalInstanceGroup>> InstanceManager::FindGroups(
289289
const InstanceDatabase::Filter& filter) const {
290-
return instance_db_.FindGroups(filter);
290+
return CF_EXPECT(instance_db_.FindGroups(filter));
291291
}
292292

293293
Result<LocalInstanceGroup> InstanceManager::FindGroup(

0 commit comments

Comments
 (0)