commit 77e28bd5261e47775c8b65759320036a5fb52f15
author Yurii Zubrytskyi <zyy@google.com> Fri Nov 10 13:56:07 2023 -0800
committer Yurii Zubrytskyi <zyy@google.com> Wed Jan 17 23:52:44 2024 -0800
tree ff23445c4e231978d9241a2c67b86139d5fdeb66
parent 342811136453f8b41c022411c6c3d9fd7f3b0826

[cleanup] Fix initializers order

Bug: 282215580
Test: build + boot + perf record

Change-Id: I5c76515aa3dad405a2938d8d0e87048cc52cf61b

cmds/idmap2/libidmap2/FabricatedOverlay.cpp

diff --git a/cmds/idmap2/libidmap2/FabricatedOverlay.cpp b/cmds/idmap2/libidmap2/FabricatedOverlay.cpp
index 16bb896..55ea15d 100644
--- a/cmds/idmap2/libidmap2/FabricatedOverlay.cpp
+++ b/cmds/idmap2/libidmap2/FabricatedOverlay.cpp
@@ -468,9 +468,9 @@
                                        entry.name().c_str());
         const auto& res_value = entry.res_value();
         result.pairs.emplace_back(OverlayData::Value{
-            name, TargetValueWithConfig{.config = entry.configuration(), .value = TargetValue{
+            name, TargetValueWithConfig{.value = TargetValue{
                     .data_type = static_cast<uint8_t>(res_value.data_type()),
-                    .data_value = res_value.data_value()}}});
+                    .data_value = res_value.data_value()}, .config = entry.configuration()}});
       }
     }
   }

cmds/idmap2/libidmap2/ResourceContainer.cpp

diff --git a/cmds/idmap2/libidmap2/ResourceContainer.cpp b/cmds/idmap2/libidmap2/ResourceContainer.cpp
index 7869fbd..9025b5b 100644
--- a/cmds/idmap2/libidmap2/ResourceContainer.cpp
+++ b/cmds/idmap2/libidmap2/ResourceContainer.cpp
@@ -227,9 +227,9 @@
     } else {
       overlay_data.pairs.emplace_back(
           OverlayData::Value{*target_resource, TargetValueWithConfig{
-              .config = std::string(),
               .value = TargetValue{.data_type = overlay_resource->dataType,
-                                   .data_value = overlay_resource->data}}});
+                                   .data_value = overlay_resource->data},
+              .config = std::string()}});
     }
   }