Add clang-format configuration, clean up

3 files changed, 35 insertions, 3 deletions

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..7443a3c
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,34 @@
+# 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
+
+# Must be kept synchronized with gi18n.h
+WhitespaceSensitiveMacros: ['_', 'Q_', 'N_', 'C_', 'NC_']
+
+# 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
+
+# GLib-specific macro body wrappers.
+MacroBlockBegin: "G_STMT_START"
+MacroBlockEnd: "G_STMT_END"
diff --git a/sensei-raw-ctl-gui.c b/sensei-raw-ctl-gui.c
index de72b26..3c50d0b 100644
--- a/sensei-raw-ctl-gui.c
+++ b/sensei-raw-ctl-gui.c
@@ -395,4 +395,3 @@ main (int argc, char *argv[])
 	g_object_unref (builder);
 	return 0;
 }
-
diff --git a/sensei-raw-ctl.c b/sensei-raw-ctl.c
index 364e2ee..450113f 100644
--- a/sensei-raw-ctl.c
+++ b/sensei-raw-ctl.c
@@ -73,7 +73,7 @@ find_device (int vendor, int product, int *error)
 	}
 
 out_free:
-	libusb_free_device_list(list, 1);
+	libusb_free_device_list (list, 1);
 out:
 	if (error != NULL && err != 0)
 		*error = err;
@@ -621,4 +621,3 @@ error_1:
 error_0:
 	return status;
 }
-