From ac1c57fcf5dff06ae4e7e5fad7baa8f93c413e37 Mon Sep 17 00:00:00 2001
From: Milan Zamazal <mzamazal@redhat.com>
Date: Mon, 2 Sep 2024 17:42:11 +0200
Subject: libcamera: includes: Formatting improvements

The LSP autoformatter doesn't like some of the current formatting, let's
make it happier.  Note that not all of its suggestions were accepted
because readability is preferred and adjusting .clang-format may not be
easy or possible.

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/base/utils.h                   | 2 +-
 include/libcamera/internal/ipa_data_serializer.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/libcamera/base/utils.h b/include/libcamera/base/utils.h
index 98c683a7..a9b27d0f 100644
--- a/include/libcamera/base/utils.h
+++ b/include/libcamera/base/utils.h
@@ -12,8 +12,8 @@
 #include <iterator>
 #include <ostream>
 #include <sstream>
-#include <string>
 #include <string.h>
+#include <string>
 #include <sys/time.h>
 #include <type_traits>
 #include <utility>
diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h
index 13470a89..66d9a19f 100644
--- a/include/libcamera/internal/ipa_data_serializer.h
+++ b/include/libcamera/internal/ipa_data_serializer.h
@@ -18,6 +18,7 @@
 #include <libcamera/control_ids.h>
 #include <libcamera/framebuffer.h>
 #include <libcamera/geometry.h>
+
 #include <libcamera/ipa/ipa_interface.h>
 
 #include "libcamera/internal/control_serializer.h"
@@ -161,7 +162,7 @@ public:
 		std::vector<SharedFD>::const_iterator fdIter = fdsBegin;
 		for (uint32_t i = 0; i < vecLen; i++) {
 			uint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);
-			uint32_t sizeofFds  = readPOD<uint32_t>(dataIter, 4, dataEnd);
+			uint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);
 			dataIter += 8;
 
 			ret[i] = IPADataSerializer<V>::deserialize(dataIter,
@@ -268,7 +269,7 @@ public:
 		std::vector<SharedFD>::const_iterator fdIter = fdsBegin;
 		for (uint32_t i = 0; i < mapLen; i++) {
 			uint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);
-			uint32_t sizeofFds  = readPOD<uint32_t>(dataIter, 4, dataEnd);
+			uint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);
 			dataIter += 8;
 
 			K key = IPADataSerializer<K>::deserialize(dataIter,
@@ -280,7 +281,7 @@ public:
 			dataIter += sizeofData;
 			fdIter += sizeofFds;
 			sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);
-			sizeofFds  = readPOD<uint32_t>(dataIter, 4, dataEnd);
+			sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);
 			dataIter += 8;
 
 			const V value = IPADataSerializer<V>::deserialize(dataIter,
-- 
cgit v1.2.1