ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[fs_mgr] fix -Wreorder-init-list

Browse source 
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: Nick Desaulniers <ndesaulniers@google.com>
This commit is contained in:
Nick Desaulniers 2019-10-11 10:52:16 -07:00
parent 67d52aa0f6
commit 8e048440e5
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/fs_mgr_fstab.cpp
View file

@ -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;

8
fs_mgr/libfs_avb/tests/avb_util_test.cpp
View file

@ -101,10 +101,10 @@ TEST_F(AvbUtilTest, AvbPartitionToDevicePatition) {
TEST_F(AvbUtilTest, DeriveAvbPartitionName) {
// The fstab_entry to test.
FstabEntry fstab_entry = {
.blk_device = "/dev/block/dm-1", // a dm-linear device (logical)
.mount_point = "/system",
.fs_type = "ext4",
.logical_partition_name = "system",
.blk_device = "/dev/block/dm-1", // a dm-linear device (logical)
.logical_partition_name = "system",
.mount_point = "/system",
.fs_type = "ext4",
};
// Logical partitions.

2
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -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)) {