Patch Detail
Show a patch.
GET /api/1.1/patches/21120/?format=api
{ "id": 21120, "url": "https://patchwork.libcamera.org/api/1.1/patches/21120/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21120/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20240830152721.1420313-18-mzamazal@redhat.com>", "date": "2024-08-30T15:27:14", "name": "[v2,17/20] libcamera: libcamera: Formatting improvements", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8fb9bd5f863a1806cb9604e874f445e0b1393644", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21120/mbox/", "series": [ { "id": 4552, "url": "https://patchwork.libcamera.org/api/1.1/series/4552/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4552", "date": "2024-08-30T15:26:57", "name": "Remove unused includes", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4552/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21120/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21120/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 68EF7C32DC\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 30 Aug 2024 15:28:18 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 86AF8634F2;\n\tFri, 30 Aug 2024 17:28:17 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 341C6634DD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Aug 2024 17:28:00 +0200 (CEST)", "from mx-prod-mc-02.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-148-VGTRjR0TPPmuB6Ksb1XZ2g-1;\n\tFri, 30 Aug 2024 11:27:57 -0400", "from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.17])\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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 2AD691955D4E for <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Aug 2024 15:27:57 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.65])\n\tby mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id E12111956048; Fri, 30 Aug 2024 15:27:55 +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=\"Sy26thIo\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1725031679;\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=23M2hfhy+zNZHg/JuWmM6lqOiuQNPh2eIHg+QDYwtBA=;\n\tb=Sy26thIoXjSpQhJidzVA55z6Drf7l8221x0nzzVQuwsfCzbjf/KIUD5V+PITf9cq2Y3IGV\n\tvg8wkXzGzj7q1V+ul2e/3xDqOgZ1cTU+Yu//m1EVzbH/3SfeSfV3kOmSYVaTjMj2zK0Viw\n\tuoHkevUcvwAzr/2ExRzNbnVlcFGTqn0=", "X-MC-Unique": "VGTRjR0TPPmuB6Ksb1XZ2g-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH v2 17/20] libcamera: libcamera: Formatting improvements", "Date": "Fri, 30 Aug 2024 17:27:14 +0200", "Message-ID": "<20240830152721.1420313-18-mzamazal@redhat.com>", "In-Reply-To": "<20240830152721.1420313-1-mzamazal@redhat.com>", "References": "<20240830152721.1420313-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.17", "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 src/libcamera/base/event_dispatcher_poll.cpp | 3 +-\n src/libcamera/camera.cpp | 4 +-\n src/libcamera/controls.cpp | 31 +++----\n src/libcamera/ipa_data_serializer.cpp | 95 ++++++++++----------\n src/libcamera/ipa_module.cpp | 15 ++--\n src/libcamera/orientation.cpp | 16 ++--\n src/libcamera/pipeline_handler.cpp | 5 +-\n src/libcamera/process.cpp | 7 +-\n src/libcamera/sensor/camera_sensor.cpp | 6 +-\n src/libcamera/shared_mem_object.cpp | 4 +-\n src/libcamera/stream.cpp | 6 +-\n 11 files changed, 97 insertions(+), 95 deletions(-)", "diff": "diff --git a/src/libcamera/base/event_dispatcher_poll.cpp b/src/libcamera/base/event_dispatcher_poll.cpp\nindex 86a26f36..288246ff 100644\n--- a/src/libcamera/base/event_dispatcher_poll.cpp\n+++ b/src/libcamera/base/event_dispatcher_poll.cpp\n@@ -5,8 +5,6 @@\n * Poll-based event dispatcher\n */\n \n-#include <libcamera/base/event_dispatcher_poll.h>\n-\n #include <chrono>\n #include <iomanip>\n #include <poll.h>\n@@ -15,6 +13,7 @@\n #include <sys/eventfd.h>\n #include <unistd.h>\n \n+#include <libcamera/base/event_dispatcher_poll.h>\n #include <libcamera/base/event_notifier.h>\n #include <libcamera/base/log.h>\n #include <libcamera/base/thread.h>\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 88210ff3..69e54439 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -5,7 +5,7 @@\n * Camera device\n */\n \n-#include <libcamera/camera.h>\n+#include \"libcamera/internal/camera.h\"\n \n #include <array>\n #include <atomic>\n@@ -13,12 +13,12 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/thread.h>\n \n+#include <libcamera/camera.h>\n #include <libcamera/color_space.h>\n #include <libcamera/framebuffer_allocator.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n-#include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/camera_controls.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n #include \"libcamera/internal/request.h\"\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 67400797..603e2672 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -5,15 +5,15 @@\n * Control handling\n */\n \n-#include <libcamera/controls.h>\n-\n #include <sstream>\n-#include <string>\n #include <string.h>\n+#include <string>\n \n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n+#include <libcamera/controls.h>\n+\n #include \"libcamera/internal/control_validator.h\"\n \n /**\n@@ -51,15 +51,15 @@ LOG_DEFINE_CATEGORY(Controls)\n namespace {\n \n static constexpr size_t ControlValueSize[] = {\n-\t[ControlTypeNone]\t\t= 0,\n-\t[ControlTypeBool]\t\t= sizeof(bool),\n-\t[ControlTypeByte]\t\t= sizeof(uint8_t),\n-\t[ControlTypeInteger32]\t\t= sizeof(int32_t),\n-\t[ControlTypeInteger64]\t\t= sizeof(int64_t),\n-\t[ControlTypeFloat]\t\t= sizeof(float),\n-\t[ControlTypeString]\t\t= sizeof(char),\n-\t[ControlTypeRectangle]\t\t= sizeof(Rectangle),\n-\t[ControlTypeSize]\t\t= sizeof(Size),\n+\t[ControlTypeNone] = 0,\n+\t[ControlTypeBool] = sizeof(bool),\n+\t[ControlTypeByte] = sizeof(uint8_t),\n+\t[ControlTypeInteger32] = sizeof(int32_t),\n+\t[ControlTypeInteger64] = sizeof(int64_t),\n+\t[ControlTypeFloat] = sizeof(float),\n+\t[ControlTypeString] = sizeof(char),\n+\t[ControlTypeRectangle] = sizeof(Rectangle),\n+\t[ControlTypeSize] = sizeof(Size),\n };\n \n } /* namespace */\n@@ -186,8 +186,8 @@ Span<const uint8_t> ControlValue::data() const\n {\n \tstd::size_t size = numElements_ * ControlValueSize[type_];\n \tconst uint8_t *data = size > sizeof(value_)\n-\t\t\t ? reinterpret_cast<const uint8_t *>(storage_)\n-\t\t\t : reinterpret_cast<const uint8_t *>(&value_);\n+\t\t\t\t ? reinterpret_cast<const uint8_t *>(storage_)\n+\t\t\t\t : reinterpret_cast<const uint8_t *>(&value_);\n \treturn { data, size };\n }\n \n@@ -700,7 +700,8 @@ bool ControlInfoMap::validate()\n \t\t * values.\n \t\t */\n \t\tControlType rangeType = id->type() == ControlTypeString\n-\t\t\t\t ? ControlTypeInteger32 : id->type();\n+\t\t\t\t\t\t? ControlTypeInteger32\n+\t\t\t\t\t\t: id->type();\n \t\tconst ControlInfo &info = ctrl.second;\n \n \t\tif (info.min().type() != rangeType) {\ndiff --git a/src/libcamera/ipa_data_serializer.cpp b/src/libcamera/ipa_data_serializer.cpp\nindex f6dd7e6f..67a5726a 100644\n--- a/src/libcamera/ipa_data_serializer.cpp\n+++ b/src/libcamera/ipa_data_serializer.cpp\n@@ -188,52 +188,52 @@ namespace {\n \n #ifndef __DOXYGEN__\n \n-#define DEFINE_POD_SERIALIZER(type)\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-template<>\t\t\t\t\t\t\t\t\\\n-std::tuple<std::vector<uint8_t>, std::vector<SharedFD>>\t\t\\\n-IPADataSerializer<type>::serialize(const type &data,\t\t\t\\\n-\t\t\t\t [[maybe_unused]] ControlSerializer *cs) \\\n-{\t\t\t\t\t\t\t\t\t\\\n-\tstd::vector<uint8_t> dataVec;\t\t\t\t\t\\\n-\tdataVec.reserve(sizeof(type));\t\t\t\t\t\\\n-\tappendPOD<type>(dataVec, data);\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\treturn { dataVec, {} };\t\t\t\t\t\t\\\n-}\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-template<>\t\t\t\t\t\t\t\t\\\n-type IPADataSerializer<type>::deserialize(std::vector<uint8_t>::const_iterator dataBegin, \\\n-\t\t\t\t\t std::vector<uint8_t>::const_iterator dataEnd, \\\n-\t\t\t\t\t [[maybe_unused]] ControlSerializer *cs) \\\n-{\t\t\t\t\t\t\t\t\t\\\n-\treturn readPOD<type>(dataBegin, 0, dataEnd);\t\t\t\\\n-}\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-template<>\t\t\t\t\t\t\t\t\\\n-type IPADataSerializer<type>::deserialize(const std::vector<uint8_t> &data, \\\n-\t\t\t\t\t ControlSerializer *cs)\t\\\n-{\t\t\t\t\t\t\t\t\t\\\n-\treturn deserialize(data.cbegin(), data.end(), cs);\t\t\\\n-}\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-template<>\t\t\t\t\t\t\t\t\\\n-type IPADataSerializer<type>::deserialize(const std::vector<uint8_t> &data, \\\n-\t\t\t\t\t [[maybe_unused]] const std::vector<SharedFD> &fds, \\\n-\t\t\t\t\t ControlSerializer *cs)\t\\\n-{\t\t\t\t\t\t\t\t\t\\\n-\treturn deserialize(data.cbegin(), data.end(), cs);\t\t\\\n-}\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-template<>\t\t\t\t\t\t\t\t\\\n-type IPADataSerializer<type>::deserialize(std::vector<uint8_t>::const_iterator dataBegin, \\\n-\t\t\t\t\t std::vector<uint8_t>::const_iterator dataEnd, \\\n-\t\t\t\t\t [[maybe_unused]] std::vector<SharedFD>::const_iterator fdsBegin, \\\n-\t\t\t\t\t [[maybe_unused]] std::vector<SharedFD>::const_iterator fdsEnd, \\\n-\t\t\t\t\t ControlSerializer *cs)\t\\\n-{\t\t\t\t\t\t\t\t\t\\\n-\treturn deserialize(dataBegin, dataEnd, cs);\t\t\t\\\n-}\n+#define DEFINE_POD_SERIALIZER(type) \\\n+ \\\n+\ttemplate<> \\\n+\tstd::tuple<std::vector<uint8_t>, std::vector<SharedFD>> \\\n+\tIPADataSerializer<type>::serialize(const type &data, \\\n+\t\t\t\t\t [[maybe_unused]] ControlSerializer *cs) \\\n+\t{ \\\n+\t\tstd::vector<uint8_t> dataVec; \\\n+\t\tdataVec.reserve(sizeof(type)); \\\n+\t\tappendPOD<type>(dataVec, data); \\\n+ \\\n+\t\treturn { dataVec, {} }; \\\n+\t} \\\n+ \\\n+\ttemplate<> \\\n+\ttype IPADataSerializer<type>::deserialize(std::vector<uint8_t>::const_iterator dataBegin, \\\n+\t\t\t\t\t\t std::vector<uint8_t>::const_iterator dataEnd, \\\n+\t\t\t\t\t\t [[maybe_unused]] ControlSerializer *cs) \\\n+\t{ \\\n+\t\treturn readPOD<type>(dataBegin, 0, dataEnd); \\\n+\t} \\\n+ \\\n+\ttemplate<> \\\n+\ttype IPADataSerializer<type>::deserialize(const std::vector<uint8_t> &data, \\\n+\t\t\t\t\t\t ControlSerializer *cs) \\\n+\t{ \\\n+\t\treturn deserialize(data.cbegin(), data.end(), cs); \\\n+\t} \\\n+ \\\n+\ttemplate<> \\\n+\ttype IPADataSerializer<type>::deserialize(const std::vector<uint8_t> &data, \\\n+\t\t\t\t\t\t [[maybe_unused]] const std::vector<SharedFD> &fds, \\\n+\t\t\t\t\t\t ControlSerializer *cs) \\\n+\t{ \\\n+\t\treturn deserialize(data.cbegin(), data.end(), cs); \\\n+\t} \\\n+ \\\n+\ttemplate<> \\\n+\ttype IPADataSerializer<type>::deserialize(std::vector<uint8_t>::const_iterator dataBegin, \\\n+\t\t\t\t\t\t std::vector<uint8_t>::const_iterator dataEnd, \\\n+\t\t\t\t\t\t [[maybe_unused]] std::vector<SharedFD>::const_iterator fdsBegin, \\\n+\t\t\t\t\t\t [[maybe_unused]] std::vector<SharedFD>::const_iterator fdsEnd, \\\n+\t\t\t\t\t\t ControlSerializer *cs) \\\n+\t{ \\\n+\t\treturn deserialize(dataBegin, dataEnd, cs); \\\n+\t}\n \n DEFINE_POD_SERIALIZER(bool)\n DEFINE_POD_SERIALIZER(uint8_t)\n@@ -539,7 +539,6 @@ IPADataSerializer<SharedFD>::serialize(const SharedFD &data,\n \tif (data.isValid())\n \t\tfdVec.push_back(data);\n \n-\n \treturn { dataVec, fdVec };\n }\n \n@@ -606,7 +605,7 @@ IPADataSerializer<FrameBuffer::Plane>::deserialize(std::vector<uint8_t>::const_i\n \tFrameBuffer::Plane ret;\n \n \tret.fd = IPADataSerializer<SharedFD>::deserialize(dataBegin, dataBegin + 4,\n-\t\t\t\t\t\t\t\tfdsBegin, fdsBegin + 1);\n+\t\t\t\t\t\t\t fdsBegin, fdsBegin + 1);\n \tret.offset = readPOD<uint32_t>(dataBegin, 4, dataEnd);\n \tret.length = readPOD<uint32_t>(dataBegin, 8, dataEnd);\n \ndiff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp\nindex 86d88a86..b8b2eb6c 100644\n--- a/src/libcamera/ipa_module.cpp\n+++ b/src/libcamera/ipa_module.cpp\n@@ -50,8 +50,8 @@ typename std::remove_extent_t<T> *elfPointer(Span<const uint8_t> elf,\n \tif (size > elf.size() || size < objSize)\n \t\treturn nullptr;\n \n-\treturn reinterpret_cast<typename std::remove_extent_t<T> *>\n-\t\t(reinterpret_cast<const char *>(elf.data()) + offset);\n+\treturn reinterpret_cast<typename std::remove_extent_t<T> *>(\n+\t\treinterpret_cast<const char *>(elf.data()) + offset);\n }\n \n template<typename T>\n@@ -80,21 +80,22 @@ int elfVerifyIdent(Span<const uint8_t> elf)\n \n \tint a = 1;\n \tunsigned char endianness = *reinterpret_cast<char *>(&a) == 1\n-\t\t\t\t ? ELFDATA2LSB : ELFDATA2MSB;\n+\t\t\t\t\t ? ELFDATA2LSB\n+\t\t\t\t\t : ELFDATA2MSB;\n \tif (e_ident[EI_DATA] != endianness)\n \t\treturn -ENOEXEC;\n \n \treturn 0;\n }\n \n-const ElfW(Shdr) *elfSection(Span<const uint8_t> elf, const ElfW(Ehdr) *eHdr,\n-\t\t\t ElfW(Half) idx)\n+const ElfW(Shdr) * elfSection(Span<const uint8_t> elf, const ElfW(Ehdr) * eHdr,\n+\t\t\t ElfW(Half) idx)\n {\n \tif (idx >= eHdr->e_shnum)\n \t\treturn nullptr;\n \n-\toff_t offset = eHdr->e_shoff + idx *\n-\t\t\t\t static_cast<uint32_t>(eHdr->e_shentsize);\n+\toff_t offset =\n+\t\teHdr->e_shoff + idx * static_cast<uint32_t>(eHdr->e_shentsize);\n \treturn elfPointer<const ElfW(Shdr)>(elf, offset);\n }\n \ndiff --git a/src/libcamera/orientation.cpp b/src/libcamera/orientation.cpp\nindex bf960249..80dea459 100644\n--- a/src/libcamera/orientation.cpp\n+++ b/src/libcamera/orientation.cpp\n@@ -5,10 +5,10 @@\n * Image orientation\n */\n \n-#include <libcamera/orientation.h>\n-\n #include <array>\n \n+#include <libcamera/orientation.h>\n+\n /**\n * \\file orientation.h\n * \\brief Image orientation definition\n@@ -101,10 +101,14 @@ std::ostream &operator<<(std::ostream &out, const Orientation &orientation)\n {\n \tconstexpr std::array<const char *, 9> orientationNames = {\n \t\t\"\", /* Orientation starts counting from 1. */\n-\t\t\"Rotate0\", \"Rotate0Mirror\",\n-\t\t\"Rotate180\", \"Rotate180Mirror\",\n-\t\t\"Rotate90Mirror\", \"Rotate270\",\n-\t\t\"Rotate270Mirror\", \"Rotate90\",\n+\t\t\"Rotate0\",\n+\t\t\"Rotate0Mirror\",\n+\t\t\"Rotate180\",\n+\t\t\"Rotate180Mirror\",\n+\t\t\"Rotate90Mirror\",\n+\t\t\"Rotate270\",\n+\t\t\"Rotate270Mirror\",\n+\t\t\"Rotate90\",\n \t};\n \n \tout << orientationNames[static_cast<unsigned int>(orientation)];\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex a63d3503..981c2e64 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -577,8 +577,9 @@ std::string PipelineHandler::configurationFile(const std::string &subdir,\n \t\t\t<< confPath << \"'\";\n \t} else {\n \t\t/* Else look in the system locations. */\n-\t\tconfPath = std::string(LIBCAMERA_DATA_DIR)\n-\t\t\t\t+ \"/pipeline/\" + subdir + '/' + name;\n+\t\tconfPath =\n+\t\t\tstd::string(LIBCAMERA_DATA_DIR) +\n+\t\t\t\"/pipeline/\" + subdir + '/' + name;\n \t}\n \n \tret = stat(confPath.c_str(), &statbuf);\ndiff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\nindex c0f4d49f..68fad327 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -75,7 +75,7 @@ void ProcessManager::sighandler()\n \t\treturn;\n \t}\n \n-\tfor (auto it = processes_.begin(); it != processes_.end(); ) {\n+\tfor (auto it = processes_.begin(); it != processes_.end();) {\n \t\tProcess *process = *it;\n \n \t\tint wstatus;\n@@ -188,7 +188,6 @@ const struct sigaction &ProcessManager::oldsa() const\n \treturn oldsa_;\n }\n \n-\n /**\n * \\class Process\n * \\brief Process object\n@@ -270,8 +269,8 @@ int Process::start(const std::string &path,\n \t\tunsigned int len = args.size();\n \t\targv[0] = path.c_str();\n \t\tfor (unsigned int i = 0; i < len; i++)\n-\t\t\targv[i+1] = args[i].c_str();\n-\t\targv[len+1] = nullptr;\n+\t\t\targv[i + 1] = args[i].c_str();\n+\t\targv[len + 1] = nullptr;\n \n \t\texecv(path.c_str(), (char **)argv);\n \ndiff --git a/src/libcamera/sensor/camera_sensor.cpp b/src/libcamera/sensor/camera_sensor.cpp\nindex 1382081a..4a990bb9 100644\n--- a/src/libcamera/sensor/camera_sensor.cpp\n+++ b/src/libcamera/sensor/camera_sensor.cpp\n@@ -6,7 +6,6 @@\n */\n \n #include \"libcamera/internal/camera_sensor.h\"\n-#include \"libcamera/internal/media_device.h\"\n \n #include <algorithm>\n #include <float.h>\n@@ -14,15 +13,16 @@\n #include <math.h>\n #include <string.h>\n \n+#include <libcamera/base/utils.h>\n+\n #include <libcamera/camera.h>\n #include <libcamera/orientation.h>\n #include <libcamera/property_ids.h>\n \n-#include <libcamera/base/utils.h>\n-\n #include \"libcamera/internal/bayer_format.h\"\n #include \"libcamera/internal/camera_lens.h\"\n #include \"libcamera/internal/camera_sensor_properties.h\"\n+#include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/sysfs.h\"\n \n /**\ndiff --git a/src/libcamera/shared_mem_object.cpp b/src/libcamera/shared_mem_object.cpp\nindex 65b53919..d9b61d37 100644\n--- a/src/libcamera/shared_mem_object.cpp\n+++ b/src/libcamera/shared_mem_object.cpp\n@@ -57,8 +57,8 @@ SharedMem::SharedMem() = default;\n */\n SharedMem::SharedMem(const std::string &name, std::size_t size)\n {\n-\tUniqueFD memfd = MemFd::create(name.c_str(), size, MemFd::Seal::Shrink |\n-\t\t\t\t MemFd::Seal::Grow);\n+\tUniqueFD memfd = MemFd::create(name.c_str(), size,\n+\t\t\t\t MemFd::Seal::Shrink | MemFd::Seal::Grow);\n \tif (!memfd.isValid())\n \t\treturn;\n \ndiff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp\nindex e70688f6..00b15608 100644\n--- a/src/libcamera/stream.cpp\n+++ b/src/libcamera/stream.cpp\n@@ -5,17 +5,15 @@\n * Video stream for a Camera\n */\n \n-#include <libcamera/stream.h>\n-\n #include <algorithm>\n #include <array>\n #include <limits.h>\n \n-#include <libcamera/request.h>\n-\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n+#include <libcamera/request.h>\n+#include <libcamera/stream.h>\n \n /**\n * \\file stream.h\n", "prefixes": [ "v2", "17/20" ] }