From fbc5f597377ef2955fa8a801aac040d3ff1b595d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 2 Aug 2023 19:53:25 -0700 Subject: [PATCH] libsnapshot: Fix missing return keyword in error path. Bug: 288273605 Test: vts_libsnapshot_test Change-Id: I0bee5ee1ebfb61f17d2a495440048d02e2c347b1 --- fs_mgr/libsnapshot/include/libsnapshot/snapshot.h | 2 +- fs_mgr/libsnapshot/snapshot.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h b/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h index df532ee21..c056a19f8 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/snapshot.h @@ -624,7 +624,7 @@ class SnapshotManager final : public ISnapshotManager { bool CollapseSnapshotDevice(LockedFile* lock, const std::string& name, const SnapshotStatus& status); - struct MergeResult { + struct [[nodiscard]] MergeResult { explicit MergeResult(UpdateState state, MergeFailureCode failure_code = MergeFailureCode::Ok) : state(state), failure_code(failure_code) {} diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp index 09d35cff1..86ff5f710 100644 --- a/fs_mgr/libsnapshot/snapshot.cpp +++ b/fs_mgr/libsnapshot/snapshot.cpp @@ -1248,14 +1248,12 @@ auto SnapshotManager::CheckTargetMergeState(LockedFile* lock, const std::string& GetMetadataPartitionState(*current_metadata, name) == MetadataPartitionState::Updated); if (UpdateUsesUserSnapshots(lock)) { - std::string merge_status; - if (EnsureSnapuserdConnected()) { - // Query the snapshot status from the daemon - merge_status = snapuserd_client_->QuerySnapshotStatus(name); - } else { - MergeResult(UpdateState::MergeFailed, MergeFailureCode::QuerySnapshotStatus); + if (!EnsureSnapuserdConnected()) { + return MergeResult(UpdateState::MergeFailed, MergeFailureCode::QuerySnapshotStatus); } + // Query the snapshot status from the daemon + const auto merge_status = snapuserd_client_->QuerySnapshotStatus(name); if (merge_status == "snapshot-merge-failed") { return MergeResult(UpdateState::MergeFailed, MergeFailureCode::UnknownTargetType); }