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

Commit 8e048440 authored by Nick Desaulniers's avatar Nick Desaulniers
Browse files

[fs_mgr] fix -Wreorder-init-list 



C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: I8804f7dd5cba1035ac7a2979a47b661d722f664a
Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
parent 67d52aa0

fs_mgr/fs_mgr_fstab.cpp

+3 −2
Original line number Diff line number Diff line
@@ -686,13 +686,14 @@ void TransformFstabForDsu(Fstab* fstab, const std::vector<std::string>& dsu_part 
        if (entries.empty()) {

            FstabEntry entry = {

                    .blk_device = partition,

                    // .logical_partition_name is required to look up AVB Hashtree descriptors.

                    .logical_partition_name = "system",

                    .mount_point = mount_point,

                    .fs_type = "ext4",

                    .flags = MS_RDONLY,

                    .fs_options = "barrier=1",

                    .avb_keys = kGsiKeys,

                    // .logical_partition_name is required to look up AVB Hashtree descriptors.

                    .logical_partition_name = "system"};

            };

            entry.fs_mgr_flags.wait = true;

            entry.fs_mgr_flags.logical = true;

            entry.fs_mgr_flags.first_stage_mount = true;

fs_mgr/libfs_avb/tests/avb_util_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -102,9 +102,9 @@ TEST_F(AvbUtilTest, DeriveAvbPartitionName) { 
    // The fstab_entry to test.

    FstabEntry fstab_entry = {

            .blk_device = "/dev/block/dm-1",  // a dm-linear device (logical)

            .logical_partition_name = "system",

            .mount_point = "/system",

            .fs_type = "ext4",

        .logical_partition_name = "system",

    };



    // Logical partitions.

fs_mgr/libsnapshot/snapshot_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ class SnapshotTest : public ::testing::Test { 
                    .block_device = fake_super,

                    .metadata = metadata.get(),

                    .partition = &partition,

                    .device_name = GetPartitionName(partition) + "-base",

                    .force_writable = true,

                    .timeout_ms = 10s,

                    .device_name = GetPartitionName(partition) + "-base",

            };

            std::string ignore_path;

            if (!CreateLogicalPartition(params, &ignore_path)) {