[libcamera-devel,RFC,07/12] android: Use the YamlObject iterator API
diff mbox series

Message ID 20220524225816.6830-8-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • Replace boost JSON parser with libyaml in Raspberry Pi IPA
Related show

Commit Message

Laurent Pinchart May 24, 2022, 10:58 p.m. UTC 
Replace usage of YamlObject::memberNames() with the more efficient
iterator API.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_hal_config.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Patch
diff mbox series 

diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index 42f3e3aeed04..723860db2371 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -82,10 +82,8 @@  int CameraHalConfig::Private::parseConfigFile(File &file,
 	if (!yamlObjectCameras.isDictionary())
 		return -EINVAL;
 
-	std::vector<std::string> cameraIds = yamlObjectCameras.memberNames();
-	for (const std::string &cameraId : cameraIds) {
-		if (parseCameraConfigData(cameraId,
-					  yamlObjectCameras[cameraId]))
+	for (const auto &[cameraId, configData] : yamlObjectCameras.asDict()) {
+		if (parseCameraConfigData(cameraId, configData))
 			return -EINVAL;
 	}