Patch Detail
Show a patch.
GET /api/patches/21102/?format=api
{ "id": 21102, "url": "https://patchwork.libcamera.org/api/patches/21102/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21102/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240830131904.1090330-20-mzamazal@redhat.com>", "date": "2024-08-30T13:18:56", "name": "[19/19] libcamera: includes: Formatting improvements", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f9e9d253543417e3144be30c343e9b2a97c8e247", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21102/mbox/", "series": [ { "id": 4551, "url": "https://patchwork.libcamera.org/api/series/4551/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4551", "date": "2024-08-30T13:18:37", "name": "Remove unused includes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4551/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21102/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21102/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 7B9A0C32DC\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 30 Aug 2024 13:20:09 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C826F634E8;\n\tFri, 30 Aug 2024 15:20:08 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 37CE6634EC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Aug 2024 15:19:53 +0200 (CEST)", "from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-505-ntidmhr8N4yTIaZS8WmTyQ-1;\n\tFri, 30 Aug 2024 09:19:50 -0400", "from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.12])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 2AC211955F6A for <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Aug 2024 13:19:50 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.65])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id A61F719560AE; Fri, 30 Aug 2024 13:19:48 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Eicq6ZwD\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1725023992;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=mzDEvzxLzdzULr9Rz+qruecDBpWub0vf7IZevbck83E=;\n\tb=Eicq6ZwDxLgq/375AEyU3MvU/3NNlSB01dRxipY4GU67EYvRopTaPTzg1ootjCKFOLWKnk\n\t+nQDfxGnXfKGSROmAdx6AtmTmw+PrHWnZr95pdNN8Abt5FTXz5GIBKyUr/EP0uZfBW2uLI\n\tNhDNeWnsFamu3MdM3cqCgASgQAUHslo=", "X-MC-Unique": "ntidmhr8N4yTIaZS8WmTyQ-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH 19/19] libcamera: includes: Formatting improvements", "Date": "Fri, 30 Aug 2024 15:18:56 +0200", "Message-ID": "<20240830131904.1090330-20-mzamazal@redhat.com>", "In-Reply-To": "<20240830131904.1090330-1-mzamazal@redhat.com>", "References": "<20240830131904.1090330-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.12", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The LSP autoformatter doesn't like some of the current formatting, let's\nmake it happy.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n include/libcamera/base/log.h | 22 +++++-----\n include/libcamera/base/span.h | 40 +++++++++----------\n include/libcamera/base/utils.h | 2 +-\n include/libcamera/internal/camera_manager.h | 4 +-\n .../libcamera/internal/ipa_data_serializer.h | 7 ++--\n 5 files changed, 38 insertions(+), 37 deletions(-)", "diff": "diff --git a/include/libcamera/base/log.h b/include/libcamera/base/log.h\nindex 62093012..38b0ab01 100644\n--- a/include/libcamera/base/log.h\n+++ b/include/libcamera/base/log.h\n@@ -43,17 +43,17 @@ private:\n \tLogSeverity severity_;\n };\n \n-#define LOG_DECLARE_CATEGORY(name)\t\t\t\t\t\\\n-extern const LogCategory &_LOG_CATEGORY(name)();\n-\n-#define LOG_DEFINE_CATEGORY(name)\t\t\t\t\t\\\n-LOG_DECLARE_CATEGORY(name)\t\t\t\t\t\t\\\n-const LogCategory &_LOG_CATEGORY(name)()\t\t\t\t\\\n-{\t\t\t\t\t\t\t\t\t\\\n-\t/* The instance will be deleted by the Logger destructor. */\t\\\n-\tstatic LogCategory *category = LogCategory::create(#name);\t\\\n-\treturn *category;\t\t\t\t\t\t\\\n-}\n+#define LOG_DECLARE_CATEGORY(name) \\\n+\textern const LogCategory &_LOG_CATEGORY(name)();\n+\n+#define LOG_DEFINE_CATEGORY(name) \\\n+\tLOG_DECLARE_CATEGORY(name) \\\n+\tconst LogCategory &_LOG_CATEGORY(name)() \\\n+\t{ \\\n+\t\t/* The instance will be deleted by the Logger destructor. */ \\\n+\t\tstatic LogCategory *category = LogCategory::create(#name); \\\n+\t\treturn *category; \\\n+\t}\n \n class LogMessage\n {\ndiff --git a/include/libcamera/base/span.h b/include/libcamera/base/span.h\nindex 92cce4f0..86201aa2 100644\n--- a/include/libcamera/base/span.h\n+++ b/include/libcamera/base/span.h\n@@ -125,7 +125,7 @@ public:\n \tconstexpr Span(element_type (&arr)[N],\n \t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n \t\t\t\t\t\t\t element_type (*)[]>::value &&\n-\t\t\t\t\tN == Extent,\n+\t\t\t\t\t\tN == Extent,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(arr)\n \t{\n@@ -135,7 +135,7 @@ public:\n \tconstexpr Span(std::array<value_type, N> &arr,\n \t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n \t\t\t\t\t\t\t element_type (*)[]>::value &&\n-\t\t\t\t\tN == Extent,\n+\t\t\t\t\t\tN == Extent,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(arr.data())\n \t{\n@@ -145,7 +145,7 @@ public:\n \tconstexpr Span(const std::array<value_type, N> &arr,\n \t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n \t\t\t\t\t\t\t element_type (*)[]>::value &&\n-\t\t\t\t\tN == Extent,\n+\t\t\t\t\t\tN == Extent,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(arr.data())\n \t{\n@@ -154,10 +154,10 @@ public:\n \ttemplate<class Container>\n \texplicit constexpr Span(Container &cont,\n \t\t\t\tstd::enable_if_t<!details::is_span<Container>::value &&\n-\t\t\t\t\t\t !details::is_array<Container>::value &&\n-\t\t\t\t\t\t !std::is_array<Container>::value &&\n-\t\t\t\t\t\t std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n+\t\t\t\t\t\t\t !details::is_array<Container>::value &&\n+\t\t\t\t\t\t\t !std::is_array<Container>::value &&\n+\t\t\t\t\t\t\t std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont))\n \t{\n@@ -166,10 +166,10 @@ public:\n \ttemplate<class Container>\n \texplicit constexpr Span(const Container &cont,\n \t\t\t\tstd::enable_if_t<!details::is_span<Container>::value &&\n-\t\t\t\t\t\t !details::is_array<Container>::value &&\n-\t\t\t\t\t\t !std::is_array<Container>::value &&\n-\t\t\t\t\t\t std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n+\t\t\t\t\t\t\t !details::is_array<Container>::value &&\n+\t\t\t\t\t\t\t !std::is_array<Container>::value &&\n+\t\t\t\t\t\t\t std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont))\n \t{\n@@ -179,7 +179,7 @@ public:\n \ttemplate<class U, std::size_t N>\n \texplicit constexpr Span(const Span<U, N> &s,\n \t\t\t\tstd::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value &&\n-\t\t\t\t\t\t N == Extent,\n+\t\t\t\t\t\t\t N == Extent,\n \t\t\t\t\t\t std::nullptr_t> = nullptr) noexcept\n \t\t: data_(s.data())\n \t{\n@@ -316,10 +316,10 @@ public:\n \ttemplate<class Container>\n \tconstexpr Span(Container &cont,\n \t\t std::enable_if_t<!details::is_span<Container>::value &&\n-\t\t\t\t\t!details::is_array<Container>::value &&\n-\t\t\t\t\t!std::is_array<Container>::value &&\n-\t\t\t\t\tstd::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]>::value,\n+\t\t\t\t\t\t!details::is_array<Container>::value &&\n+\t\t\t\t\t\t!std::is_array<Container>::value &&\n+\t\t\t\t\t\tstd::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\tstd::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont)), size_(utils::size(cont))\n \t{\n@@ -328,10 +328,10 @@ public:\n \ttemplate<class Container>\n \tconstexpr Span(const Container &cont,\n \t\t std::enable_if_t<!details::is_span<Container>::value &&\n-\t\t\t\t\t!details::is_array<Container>::value &&\n-\t\t\t\t\t!std::is_array<Container>::value &&\n-\t\t\t\t\tstd::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]>::value,\n+\t\t\t\t\t\t!details::is_array<Container>::value &&\n+\t\t\t\t\t\t!std::is_array<Container>::value &&\n+\t\t\t\t\t\tstd::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\tstd::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont)), size_(utils::size(cont))\n \t{\ndiff --git a/include/libcamera/base/utils.h b/include/libcamera/base/utils.h\nindex 98c683a7..a9b27d0f 100644\n--- a/include/libcamera/base/utils.h\n+++ b/include/libcamera/base/utils.h\n@@ -12,8 +12,8 @@\n #include <iterator>\n #include <ostream>\n #include <sstream>\n-#include <string>\n #include <string.h>\n+#include <string>\n #include <sys/time.h>\n #include <type_traits>\n #include <utility>\ndiff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h\nindex 0150ca61..95ddf4cf 100644\n--- a/include/libcamera/internal/camera_manager.h\n+++ b/include/libcamera/internal/camera_manager.h\n@@ -7,8 +7,6 @@\n \n #pragma once\n \n-#include <libcamera/camera_manager.h>\n-\n #include <memory>\n #include <sys/types.h>\n #include <vector>\n@@ -18,6 +16,8 @@\n #include <libcamera/base/thread.h>\n #include <libcamera/base/thread_annotations.h>\n \n+#include <libcamera/camera_manager.h>\n+\n #include \"libcamera/internal/process.h\"\n \n namespace libcamera {\ndiff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h\nindex 13470a89..66d9a19f 100644\n--- a/include/libcamera/internal/ipa_data_serializer.h\n+++ b/include/libcamera/internal/ipa_data_serializer.h\n@@ -18,6 +18,7 @@\n #include <libcamera/control_ids.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n+\n #include <libcamera/ipa/ipa_interface.h>\n \n #include \"libcamera/internal/control_serializer.h\"\n@@ -161,7 +162,7 @@ public:\n \t\tstd::vector<SharedFD>::const_iterator fdIter = fdsBegin;\n \t\tfor (uint32_t i = 0; i < vecLen; i++) {\n \t\t\tuint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);\n-\t\t\tuint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);\n+\t\t\tuint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);\n \t\t\tdataIter += 8;\n \n \t\t\tret[i] = IPADataSerializer<V>::deserialize(dataIter,\n@@ -268,7 +269,7 @@ public:\n \t\tstd::vector<SharedFD>::const_iterator fdIter = fdsBegin;\n \t\tfor (uint32_t i = 0; i < mapLen; i++) {\n \t\t\tuint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);\n-\t\t\tuint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);\n+\t\t\tuint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);\n \t\t\tdataIter += 8;\n \n \t\t\tK key = IPADataSerializer<K>::deserialize(dataIter,\n@@ -280,7 +281,7 @@ public:\n \t\t\tdataIter += sizeofData;\n \t\t\tfdIter += sizeofFds;\n \t\t\tsizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);\n-\t\t\tsizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);\n+\t\t\tsizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);\n \t\t\tdataIter += 8;\n \n \t\t\tconst V value = IPADataSerializer<V>::deserialize(dataIter,\n", "prefixes": [ "19/19" ] }