From 5dec46df2c209095d712630fbdade058e7c748de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= <p@janouch.name>
Date: Sat, 30 Oct 2021 03:10:17 +0200
Subject: Add clang-format configuration, clean up

---
 .clang-format   | 32 ++++++++++++++++++++++++++++++++
 liberty-proto.c |  2 +-
 siphash.c       |  1 -
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 .clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..27838ac
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,32 @@
+# clang-format is fairly limited, and these rules are approximate:
+#  - array initializers can get terribly mangled with clang-format 12.0,
+#  - sometimes it still aligns with space characters,
+#  - struct name NL { NL ... NL } NL name; is unachievable.
+BasedOnStyle: GNU
+ColumnLimit: 80
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+BreakBeforeBraces: Allman
+SpaceAfterCStyleCast: true
+AlignAfterOpenBracket: DontAlign
+AlignOperands: DontAlign
+AlignConsecutiveMacros: Consecutive
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+IndentGotoLabels: false
+
+# IncludeCategories has some potential, but it may also break the build.
+# Note that the documentation says the value should be "Never".
+SortIncludes: false
+
+# This is a compromise, it generally works out aesthetically better.
+BinPackArguments: false
+
+# Unfortunately, this can't be told to align to column 40 or so.
+SpacesBeforeTrailingComments: 2
+
+# liberty-specific macro body wrappers.
+MacroBlockBegin: "BLOCK_START"
+MacroBlockEnd: "BLOCK_END"
+ForEachMacros: ["LIST_FOR_EACH"]
diff --git a/liberty-proto.c b/liberty-proto.c
index f7a62fd..2e92b9d 100644
--- a/liberty-proto.c
+++ b/liberty-proto.c
@@ -148,7 +148,7 @@ irc_free_message (struct irc_message *msg)
 
 static void
 irc_process_buffer (struct str *buf,
-	void (*callback)(const struct irc_message *, const char *, void *),
+	void (*callback) (const struct irc_message *, const char *, void *),
 	void *user_data)
 {
 	char *start = buf->str, *end = start + buf->len;
diff --git a/siphash.c b/siphash.c
index 8a7b063..c9864d6 100644
--- a/siphash.c
+++ b/siphash.c
@@ -82,4 +82,3 @@ siphash (const unsigned char key[16], const unsigned char *m, size_t len)
 
 	return v0 ^ v1 ^ v2 ^ v3;
 }
-
-- 
cgit v1.2.3