[{"id":3537,"web_url":"https://patchwork.libcamera.org/comment/3537/","msgid":"<20200120132917.rrjmkgxlzpcrckjk@uno.localdomain>","date":"2020-01-20T13:29:17","subject":"Re: [libcamera-devel] [PATCH 07/19] libcamera: Declare static local\n\tvariables as const where applicable","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent\n\nOn Mon, Jan 20, 2020 at 02:24:25AM +0200, Laurent Pinchart wrote:\n> We use static local variables to indicate errors in methods that return\n> a const reference. The local variables can thus be const, make them so.\n>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nI had a quick look and found no other occurencies that would benefit\nfor a similar change\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n   j\n\n> ---\n>  src/libcamera/controls.cpp              | 2 +-\n>  src/libcamera/formats.cpp               | 2 +-\n>  src/libcamera/framebuffer_allocator.cpp | 2 +-\n>  src/libcamera/log.cpp                   | 2 +-\n>  4 files changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 7d8a0e97ee3a..34a8c8dd9458 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -752,7 +752,7 @@ bool ControlList::contains(unsigned int id) const\n>   */\n>  const ControlValue &ControlList::get(unsigned int id) const\n>  {\n> -\tstatic ControlValue zero;\n> +\tstatic const ControlValue zero;\n>\n>  \tconst ControlValue *val = find(id);\n>  \tif (!val)\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 6f0ffb6dc5a8..5f6552a4e06c 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -86,7 +86,7 @@ std::vector<unsigned int> ImageFormats::formats() const\n>   */\n>  const std::vector<SizeRange> &ImageFormats::sizes(unsigned int format) const\n>  {\n> -\tstatic std::vector<SizeRange> empty;\n> +\tstatic const std::vector<SizeRange> empty;\n>\n>  \tauto const &it = data_.find(format);\n>  \tif (it == data_.end())\n> diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> index 207a13bd841d..a7588c7fe4c2 100644\n> --- a/src/libcamera/framebuffer_allocator.cpp\n> +++ b/src/libcamera/framebuffer_allocator.cpp\n> @@ -203,7 +203,7 @@ int FrameBufferAllocator::free(Stream *stream)\n>  const std::vector<std::unique_ptr<FrameBuffer>> &\n>  FrameBufferAllocator::buffers(Stream *stream) const\n>  {\n> -\tstatic std::vector<std::unique_ptr<FrameBuffer>> empty;\n> +\tstatic const std::vector<std::unique_ptr<FrameBuffer>> empty;\n>\n>  \tauto iter = buffers_.find(stream);\n>  \tif (iter == buffers_.end())\n> diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp\n> index ef0b81f77131..2bb09ac7a7bc 100644\n> --- a/src/libcamera/log.cpp\n> +++ b/src/libcamera/log.cpp\n> @@ -750,7 +750,7 @@ void LogCategory::setSeverity(LogSeverity severity)\n>   */\n>  const LogCategory &LogCategory::defaultCategory()\n>  {\n> -\tstatic LogCategory category(\"default\");\n> +\tstatic const LogCategory category(\"default\");\n>  \treturn category;\n>  }\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D59C360804\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 Jan 2020 14:26:46 +0100 (CET)","from uno.localdomain (93-34-114-233.ip49.fastwebnet.it\n\t[93.34.114.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id 405C8240011;\n\tMon, 20 Jan 2020 13:26:45 +0000 (UTC)"],"Date":"Mon, 20 Jan 2020 14:29:17 +0100","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200120132917.rrjmkgxlzpcrckjk@uno.localdomain>","References":"<20200120002437.6633-1-laurent.pinchart@ideasonboard.com>\n\t<20200120002437.6633-8-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"cxwe5v4ckov7grhc\"","Content-Disposition":"inline","In-Reply-To":"<20200120002437.6633-8-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 07/19] libcamera: Declare static local\n\tvariables as const where applicable","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Mon, 20 Jan 2020 13:26:47 -0000"}},{"id":3568,"web_url":"https://patchwork.libcamera.org/comment/3568/","msgid":"<20200122151901.GO1124294@oden.dyn.berto.se>","date":"2020-01-22T15:19:01","subject":"Re: [libcamera-devel] [PATCH 07/19] libcamera: Declare static local\n\tvariables as const where applicable","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2020-01-20 02:24:25 +0200, Laurent Pinchart wrote:\n> We use static local variables to indicate errors in methods that return\n> a const reference. The local variables can thus be const, make them so.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  src/libcamera/controls.cpp              | 2 +-\n>  src/libcamera/formats.cpp               | 2 +-\n>  src/libcamera/framebuffer_allocator.cpp | 2 +-\n>  src/libcamera/log.cpp                   | 2 +-\n>  4 files changed, 4 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 7d8a0e97ee3a..34a8c8dd9458 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -752,7 +752,7 @@ bool ControlList::contains(unsigned int id) const\n>   */\n>  const ControlValue &ControlList::get(unsigned int id) const\n>  {\n> -\tstatic ControlValue zero;\n> +\tstatic const ControlValue zero;\n>  \n>  \tconst ControlValue *val = find(id);\n>  \tif (!val)\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 6f0ffb6dc5a8..5f6552a4e06c 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -86,7 +86,7 @@ std::vector<unsigned int> ImageFormats::formats() const\n>   */\n>  const std::vector<SizeRange> &ImageFormats::sizes(unsigned int format) const\n>  {\n> -\tstatic std::vector<SizeRange> empty;\n> +\tstatic const std::vector<SizeRange> empty;\n>  \n>  \tauto const &it = data_.find(format);\n>  \tif (it == data_.end())\n> diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> index 207a13bd841d..a7588c7fe4c2 100644\n> --- a/src/libcamera/framebuffer_allocator.cpp\n> +++ b/src/libcamera/framebuffer_allocator.cpp\n> @@ -203,7 +203,7 @@ int FrameBufferAllocator::free(Stream *stream)\n>  const std::vector<std::unique_ptr<FrameBuffer>> &\n>  FrameBufferAllocator::buffers(Stream *stream) const\n>  {\n> -\tstatic std::vector<std::unique_ptr<FrameBuffer>> empty;\n> +\tstatic const std::vector<std::unique_ptr<FrameBuffer>> empty;\n>  \n>  \tauto iter = buffers_.find(stream);\n>  \tif (iter == buffers_.end())\n> diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp\n> index ef0b81f77131..2bb09ac7a7bc 100644\n> --- a/src/libcamera/log.cpp\n> +++ b/src/libcamera/log.cpp\n> @@ -750,7 +750,7 @@ void LogCategory::setSeverity(LogSeverity severity)\n>   */\n>  const LogCategory &LogCategory::defaultCategory()\n>  {\n> -\tstatic LogCategory category(\"default\");\n> +\tstatic const LogCategory category(\"default\");\n>  \treturn category;\n>  }\n>  \n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lj1-x244.google.com (mail-lj1-x244.google.com\n\t[IPv6:2a00:1450:4864:20::244])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 02BB960854\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jan 2020 16:19:03 +0100 (CET)","by mail-lj1-x244.google.com with SMTP id o13so7237087ljg.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jan 2020 07:19:02 -0800 (PST)","from localhost (h-93-159.A463.priv.bahnhof.se. [46.59.93.159])\n\tby smtp.gmail.com with ESMTPSA id\n\tr2sm20809949lfn.13.2020.01.22.07.19.01\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 22 Jan 2020 07:19:01 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=4Xo+KhxBOaTCWGw2WZxXKuN6CO5ITlHTSXPl2WlOkCM=;\n\tb=vUWqJ/GMGr0Dh11X5XZaVYTeNuVFnbzvUfWiqpcQvMAjTaZzJLYLHq667QBfFDfny8\n\t+q4KqagcUN5zRdmjeI6qxN1pAjbB76T2fs1okGPg2GT2MqU9JRnP4iiAqtPQG+8+VG6E\n\tNC5A/j6cK7OygTEDpRH8fLlntpnQgCwudtOFDxZnnMcDXFvfStz/ndHBt+8nsVL6nTa3\n\tExHThgRKG/x5t47INqybjVwgezuDOwp0WWBcDwxjJsxfQbCbKu7Siv9LR71Q3i4NMVLd\n\tDO6+tnq+hXz7Kko7FwMlDM2+yE5IcM73yRRkNX0G16bXC/3VgRilWWFQdmkBq4rMJOq/\n\tmG2g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=4Xo+KhxBOaTCWGw2WZxXKuN6CO5ITlHTSXPl2WlOkCM=;\n\tb=aWMDlj8m2WvbUmAuD7KToHckgK5P+vLA/skIpQoBvrwW2ulB7g/vAKmKO4bSPOh3DY\n\t98e9Vf+G50lEg3vOMPF0B54IYeV7ldouIAp3qsaqObNf20An2BqnVKvKrdVy/g6u3x7K\n\t4SRzn4CUuib7AFAoI/fpIYF4Wl8HIzDSYPUzt81Ne+QkRN+n77wJAqrMlfsAXc83YiJS\n\t2/eyxeayn1OVM+18ymwCoK+QiSckTUW5C/Ipa2+togpLxI6MAvtPJx0N8W0x6qDEhF50\n\tVBFqO1OxFL4DShtnXrZ5tIwWTJ6A9OaIoYeLsMc4EdIDjejoWXKZJtXePI+i0kZ1bikK\n\tLbtw==","X-Gm-Message-State":"APjAAAX9oyZ5ZJB7aHIJGXYhHMgVeYXDgXl2EgzMGEkm3xa34no8x08N\n\tT5kizdZoug7xQANWsuRYLZMln8fJeqg=","X-Google-Smtp-Source":"APXvYqyw4tXynylnzHfwoX9EZowNfU9mr3EnY2OwXW21Xzj39OF4b2e3gH3YrvCA2PkHfk3APj0JHQ==","X-Received":"by 2002:a2e:9b03:: with SMTP id u3mr19523537lji.87.1579706342494;\n\tWed, 22 Jan 2020 07:19:02 -0800 (PST)","Date":"Wed, 22 Jan 2020 16:19:01 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200122151901.GO1124294@oden.dyn.berto.se>","References":"<20200120002437.6633-1-laurent.pinchart@ideasonboard.com>\n\t<20200120002437.6633-8-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200120002437.6633-8-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 07/19] libcamera: Declare static local\n\tvariables as const where applicable","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Wed, 22 Jan 2020 15:19:03 -0000"}}]