clang-format: disable include sorting and trailing comment alignment

Explained in comments. Minimal impact to existing .c code, but makes
rendered code blocks in markdown easier to read.

Signed-off-by: Timo Beckers <[email protected]>

Author: ti-mo

.clang-format

@@ -4,6 +4,9 @@ BasedOnStyle:    LLVM
 AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: true
 AlignEscapedNewlines: DontAlign
+# mkdocs annotations in source code are written as trailing comments
+# and alignment pushes these really far away from the content.
+AlignTrailingComments: false
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: false
 AllowAllParametersOfDeclarationOnNextLine: false
@@ -16,4 +19,7 @@ UseTab:          ForContinuationAndIndentation
 ColumnLimit:     1000
 # Go compiler comments need to stay unindented.
 CommentPragmas: '^go:.*'
+# linux/bpf.h needs to be included before bpf/bpf_helpers.h for types like __u64
+# and sorting makes this impossible.
+SortIncludes: false
 ...

btf/testdata/relocs_read_tgt.c

@@ -20,10 +20,10 @@ typedef unsigned long u64;
 struct bits {
 	/*int x;*/
 	u8 b : 2, a : 4; /* a was before b */
-	my_u32 d : 2;    /* was 'unsigned int' */
-	u16 c : 1;       /* was before d */
+	my_u32 d : 2; /* was 'unsigned int' */
+	u16 c : 1; /* was before d */
 	enum { ZERO = 0, ONE = 1 } e : 1;
-	u16 f;      /* was: u64 f:16 */
+	u16 f; /* was: u64 f:16 */
 	u32 g : 30; /* was: u64 g:30 */
 };
 

examples/xdp/xdp.c

@@ -11,7 +11,7 @@ char __license[] SEC("license") = "Dual MIT/GPL";
 struct {
 	__uint(type, BPF_MAP_TYPE_LRU_HASH);
 	__uint(max_entries, MAX_MAP_ENTRIES);
-	__type(key, __u32);   // source IPv4 address
+	__type(key, __u32); // source IPv4 address
 	__type(value, __u32); // packet count
 } xdp_stats_map SEC(".maps");
 

testdata/loader.c

@@ -112,7 +112,7 @@ int __attribute__((noinline)) global_fn(uint32_t arg) {
 static volatile unsigned int key1 = 0; // .bss
 static volatile unsigned int key2 = 1; // .data
 volatile const unsigned int key3  = 2; // .rodata
-static volatile const uint32_t arg;    // .rodata, populated by loader
+static volatile const uint32_t arg; // .rodata, populated by loader
 // custom .rodata section, populated by loader
 static volatile const uint32_t arg2 __section(".rodata.test");
 #endif