clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: Ie3bd23911d86a3097f21b036a94f1dda3e38b511
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/.clang-format b/.clang-format
index d43e884..28e3328 100644
--- a/.clang-format
+++ b/.clang-format
@@ -87,7 +87,7 @@
IndentWrappedFunctionNames: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
-LambdaBodyIndentation: OuterScope
+LambdaBodyIndentation: Signature
LineEnding: LF
MacroBlockBegin: ''
MacroBlockEnd: ''
@@ -98,13 +98,14 @@
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: BinPack
PenaltyBreakAssignment: 25
-PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakBeforeFirstCallParameter: 50
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
+PenaltyIndentedWhitespace: 1
PointerAlignment: Left
QualifierAlignment: Left
ReferenceAlignment: Left
diff --git a/src/gpioplus/internal/sys.hpp b/src/gpioplus/internal/sys.hpp
index 6965dd2..af390f1 100644
--- a/src/gpioplus/internal/sys.hpp
+++ b/src/gpioplus/internal/sys.hpp
@@ -23,17 +23,14 @@
virtual int fcntl_setfl(int fd, int flags) const = 0;
virtual int fcntl_getfl(int fd) const = 0;
- virtual int
- gpiohandle_get_line_values(int fd,
- struct gpiohandle_data* data) const = 0;
- virtual int
- gpiohandle_set_line_values(int fd,
- struct gpiohandle_data* data) const = 0;
+ virtual int gpiohandle_get_line_values(
+ int fd, struct gpiohandle_data* data) const = 0;
+ virtual int gpiohandle_set_line_values(
+ int fd, struct gpiohandle_data* data) const = 0;
virtual int gpio_get_chipinfo(int fd, struct gpiochip_info* info) const = 0;
virtual int gpio_get_lineinfo(int fd, struct gpioline_info* info) const = 0;
- virtual int
- gpio_get_linehandle(int fd,
- struct gpiohandle_request* request) const = 0;
+ virtual int gpio_get_linehandle(
+ int fd, struct gpiohandle_request* request) const = 0;
virtual int gpio_get_lineevent(int fd,
struct gpioevent_request* request) const = 0;
};
diff --git a/test/event.cpp b/test/event.cpp
index f245747..db3a6a3 100644
--- a/test/event.cpp
+++ b/test/event.cpp
@@ -107,9 +107,9 @@
struct gpioevent_request req;
EXPECT_CALL(mock, gpio_get_lineevent(chip_fd, testing::_))
.WillOnce(DoAll(SaveArgPointee<1>(&req), Return(-EINVAL)));
- EXPECT_THROW(
- Event(*chip, line_offset, handle_flags, event_flags, label.c_str()),
- std::system_error);
+ EXPECT_THROW(Event(*chip, line_offset, handle_flags, event_flags,
+ label.c_str()),
+ std::system_error);
EXPECT_EQ(line_offset, req.lineoffset);
EXPECT_EQ(GPIOHANDLE_REQUEST_INPUT, req.handleflags);