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

Commit 6ebee20c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add VerifyMergeOps() to CowReader interface" am: bd69a746 am: 4e8f468a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1838573

Change-Id: I8bb67d009cef5c2db664aaafead7eb68b7d0a345
parents fea949af 4e8f468a

fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ class ICowReader { 




    // Return the file footer.

    // Return the file footer.

    virtual bool GetFooter(CowFooter* footer) = 0;

    virtual bool GetFooter(CowFooter* footer) = 0;

    virtual bool VerifyMergeOps() = 0;





    // Return the last valid label

    // Return the last valid label

    virtual bool GetLastLabel(uint64_t* label) = 0;

    virtual bool GetLastLabel(uint64_t* label) = 0;
@@ -101,7 +102,7 @@ class ICowOpIter { 
    virtual void Next() = 0;

    virtual void Next() = 0;

};

};





class CowReader : public ICowReader {

class CowReader final : public ICowReader {

  public:

  public:

    CowReader();

    CowReader();

    ~CowReader() { owned_fd_ = {}; }

    ~CowReader() { owned_fd_ = {}; }
@@ -112,7 +113,7 @@ class CowReader : public ICowReader { 
    bool Parse(android::base::borrowed_fd fd, std::optional<uint64_t> label = {});

    bool Parse(android::base::borrowed_fd fd, std::optional<uint64_t> label = {});





    bool InitForMerge(android::base::unique_fd&& fd);

    bool InitForMerge(android::base::unique_fd&& fd);

    bool VerifyMergeOps();

    bool VerifyMergeOps() override;





    bool GetHeader(CowHeader* header) override;

    bool GetHeader(CowHeader* header) override;

    bool GetFooter(CowFooter* footer) override;

    bool GetFooter(CowFooter* footer) override;