From patchwork Sat Jun 4 18:59:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 16164 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 99255C3279 for ; Sat, 4 Jun 2022 19:00:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1ECAF65646; Sat, 4 Jun 2022 21:00:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1654369213; bh=Ic3F3Afbq5cwq4A8ifAQhqKg4w3eXeU4Dm+xJoUklrM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=FB0NORvWhjRiUZoCQ9R8TgS+RJwPqkhkMROjEagI8h17cL50HO1eskrDbrhM54/Sp 9zoKulddGCeSwzV2tvENtm+KfoW6X9Bw5foRKtsqs2UApMPjF7vZVr/9YurPN0ANOT inw2C4wgukqrQctFIvgrHpmqkyZeMoWhBVLk5JRCT0QQ9tT2ajAGTi0SXSg/A5Wdy3 ZdFR0+ZQaSrorwyiuU+129bFxZKjw9el+3SmRifxdYvrV2+TLvtBD+LjeXoxfoXsGp NYZamgpLrML4B9PvoW7hZ++cFn2m8WpTF1OC8PFXNspLRb7ORcPCazAFWqvW5vGVHm Hzk75ml6LUWKw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4D3ED633A6 for ; Sat, 4 Jun 2022 21:00:12 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CoW4zHeb"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (85-76-79-203-nat.elisa-mobile.fi [85.76.79.203]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DE32BE0F; Sat, 4 Jun 2022 21:00:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1654369212; bh=Ic3F3Afbq5cwq4A8ifAQhqKg4w3eXeU4Dm+xJoUklrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CoW4zHeby2LL1j+tOBPhLCQabDG+zaMfnBKczgXxSguih2ndGMWafq5Pc1JuBPuly OJIESbKLbCKzzZ4Jza+bQouPD/eRB9VExzBbxZPKEwqaXo4dvV9BP+uoIiPBrlKKvS qI7dIxkdJyVFBD9AplI/b2kzp8R3O3vpuGFZcxKA= To: libcamera-devel@lists.libcamera.org Date: Sat, 4 Jun 2022 21:59:34 +0300 Message-Id: <20220604185939.29163-10-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220604185939.29163-1-laurent.pinchart@ideasonboard.com> References: <20220604185939.29163-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 09/14] android: Use the YamlObject iterator API X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Replace usage of YamlObject::memberNames() with the more efficient iterator API. Signed-off-by: Laurent Pinchart --- src/android/camera_hal_config.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp index ac484b8df1bd..bacfe4b9c505 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 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; }