From patchwork Tue May 24 22:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 16033 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 9FF3CC326E for ; Tue, 24 May 2022 22:58:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0173165676; Wed, 25 May 2022 00:58:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1653433115; bh=+B+P8nN4wN36md/i6eEoSbd3s0PvS4G8/FkDKBz6VlY=; 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=dk7DwgOWbPExkI7ELOZ6iBVG1QN0wHnzG+Y8/HlHPrw6FmRugEVcVC+3rv3lRHoSs dWH4w7eKTbppKr0a36Sb0C2aV34/uV/3lvDg4Myl7Sp8qiRlayvvxaxiso1bKJslo/ TvZ3UaYITqb/2Wwu+VSmizPO88JRvoozG2jlPbTqP8qq+o75dB5IQsxLp0xrhAME6w ybTAMxwAGYmHXakc3KI0XXfMLof72SBFRQAb9qEgvTAIwuFHcIWhCKFEe+ra5fNIvX 7J80FqF8IFK/5axt5hcFD2RN1lrqcpbAALev60KVSyA4HvIRlvAza9dhXrTv0p+g9s y9yqHWK2heOLw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B89ED65663 for ; Wed, 25 May 2022 00:58:28 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="kBBEXskE"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (ip-109-40-241-133.web.vodafone.de [109.40.241.133]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 23F8F1245; Wed, 25 May 2022 00:58:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1653433108; bh=+B+P8nN4wN36md/i6eEoSbd3s0PvS4G8/FkDKBz6VlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kBBEXskE0Rm8jZCqMjP0Pkv7kCf2mYMXib+fMHJ9pqoqcjhMxwdcE0rQ+jBliMHcg cpscLQu1So22Ji57H+RZDU7XIr1DlRBtfJkzZ1Mv348J0CM00zFyVKuBBROIkDEn4P j0nw0eeM+WqKcJlB22L1QJvFyfPPSgSKCa9KdYcU= To: libcamera-devel@lists.libcamera.org Date: Wed, 25 May 2022 01:58:11 +0300 Message-Id: <20220524225816.6830-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220524225816.6830-1-laurent.pinchart@ideasonboard.com> References: <20220524225816.6830-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 07/12] 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 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 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; }