[{"id":18716,"web_url":"https://patchwork.libcamera.org/comment/18716/","msgid":"","date":"2021-08-11T22:52:46","subject":"Re: [libcamera-devel] [PATCH 1/3] libcamera: controls: Use a const\n\tControlValidator","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Tue, Aug 10, 2021 at 05:11:32PM +0100, Kieran Bingham wrote:\n> The ControlValidator passed to a ControlList constructor\n> is used, but not modified.\n> \n> Make it const.\n> \n> Signed-off-by: Kieran Bingham \n\nThis looks fine, so\n\nReviewed-by: Laurent Pinchart \n\n> ---\n> include/libcamera/controls.h | 6 +++---\n> src/libcamera/controls.cpp | 6 ++++--\n> 2 files changed, 7 insertions(+), 5 deletions(-)\n> \n> diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\n> index de733bd868a6..2c38b23ad443 100644\n> --- a/include/libcamera/controls.h\n> +++ b/include/libcamera/controls.h\n> @@ -354,8 +354,8 @@ private:\n> \n> public:\n> \tControlList();\n> -\tControlList(const ControlIdMap &idmap, ControlValidator *validator = nullptr);\n> -\tControlList(const ControlInfoMap &infoMap, ControlValidator *validator = nullptr);\n> +\tControlList(const ControlIdMap &idmap, const ControlValidator *validator = nullptr);\n> +\tControlList(const ControlInfoMap &infoMap, const ControlValidator *validator = nullptr);\n> \n> \tusing iterator = ControlListMap::iterator;\n> \tusing const_iterator = ControlListMap::const_iterator;\n> @@ -413,7 +413,7 @@ private:\n> \tconst ControlValue *find(unsigned int id) const;\n> \tControlValue *find(unsigned int id);\n> \n> -\tControlValidator *validator_;\n> +\tconst ControlValidator *validator_;\n> \tconst ControlIdMap *idmap_;\n> \tconst ControlInfoMap *infoMap_;\n> \n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 64fd5c296226..a5943700ea89 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -836,7 +836,8 @@ ControlList::ControlList()\n> * controls is provided by controls::controls and can be used as the \\a idmap\n> * argument.\n> */\n> -ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)\n> +ControlList::ControlList(const ControlIdMap &idmap,\n> +\t\t\t const ControlValidator *validator)\n> \t: validator_(validator), idmap_(&idmap), infoMap_(nullptr)\n> {\n> }\n> @@ -846,7 +847,8 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)\n> * \\param[in] infoMap The ControlInfoMap for the control list target object\n> * \\param[in] validator The validator (may be null)\n> */\n> -ControlList::ControlList(const ControlInfoMap &infoMap, ControlValidator *validator)\n> +ControlList::ControlList(const ControlInfoMap &infoMap,\n> +\t\t\t const ControlValidator *validator)\n> \t: validator_(validator), idmap_(&infoMap.idmap()), infoMap_(&infoMap)\n> {\n> }","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 51356C3240\n\tfor ;\n\tWed, 11 Aug 2021 22:52:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C1FC968864;\n\tThu, 12 Aug 2021 00:52:50 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CFFEB687F0\n\tfor ;\n\tThu, 12 Aug 2021 00:52:49 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 50401EE;\n\tThu, 12 Aug 2021 00:52:49 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"YKU3czan\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628722369;\n\tbh=h+DmDJvrle5ztEuCyZqZxE7LSIbEKF6aiPtKu4SbbRs=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=YKU3czanO0sYqQJqUcpiK6O/2PL5RZwHJw9zVznWCRpMjRz4CgSjZT9cw81S87dr+\n\tDVNrVqeHbJOLVftzmYulgIejsCUp5G7iGZ+XYPk6jiPnJHaPqqf0TYGuCMyxagUpqP\n\tGLp6ljvaQDpU71V+B4xV4JktKBFFE9NrKuREhuxA=","Date":"Thu, 12 Aug 2021 01:52:46 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"","References":"<20210810161134.2243796-1-kieran.bingham@ideasonboard.com>\n\t<20210810161134.2243796-2-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210810161134.2243796-2-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 1/3] libcamera: controls: Use a const\n\tControlValidator","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]