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

Commit 38db1335 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "liblp: convert more functions to use string_view (#3)" am: 2fa089be am: 949a1379 

am: 78ac377e

Change-Id: I11e46f762dbccdd3b96ff49dcb1932ca9573adbe
parents 7b1ac188 78ac377e

fs_mgr/liblp/builder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ bool MetadataBuilder::Init(const std::vector<BlockDeviceInfo>& block_devices, 
    return true;

}



bool MetadataBuilder::AddGroup(const std::string& group_name, uint64_t maximum_size) {

bool MetadataBuilder::AddGroup(std::string_view group_name, uint64_t maximum_size) {

    if (FindGroup(group_name)) {

        LERROR << "Group already exists: " << group_name;

        return false;

fs_mgr/liblp/include/liblp/builder.h

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class PartitionGroup final { 
    friend class MetadataBuilder;



  public:

    explicit PartitionGroup(const std::string& name, uint64_t maximum_size)

    explicit PartitionGroup(std::string_view name, uint64_t maximum_size)

        : name_(name), maximum_size_(maximum_size) {}



    const std::string& name() const { return name_; }
@@ -206,7 +206,7 @@ class MetadataBuilder { 
    // total space used by all partitions in the group.

    //

    // This can fail and return false if the group already exists.

    bool AddGroup(const std::string& group_name, uint64_t maximum_size);

    bool AddGroup(std::string_view group_name, uint64_t maximum_size);



    // Export metadata so it can be serialized to an image, to disk, or mounted

    // via device-mapper.