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

Commit c8ce6347 authored by David Anderson's avatar David Anderson Committed by Gerrit Code Review
Browse files

Merge "libsnapshot: Fix missing return keyword in error path." into main

parents 0950447d fbc5f597

fs_mgr/libsnapshot/include/libsnapshot/snapshot.h

+1 −1
Original line number Diff line number Diff line
@@ -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) {}

fs_mgr/libsnapshot/snapshot.cpp

+4 −6
Original line number Diff line number Diff line
@@ -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);

        }