174 lines
7.0 KiB
Diff
174 lines
7.0 KiB
Diff
From 78723d0b5747134ef4b6fe2663fbcfc2b4737e89 Mon Sep 17 00:00:00 2001
|
|
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
|
|
Date: Thu, 28 Oct 2021 17:15:52 +0300
|
|
Subject: [PATCH 041/120] clang-format: enable AlignTrailingComments
|
|
|
|
Code becomes much more human-readable after enabling it.
|
|
|
|
Example 1:
|
|
|
|
Before:
|
|
```
|
|
struct file_desc {
|
|
u32 id; /* File id, unique */
|
|
struct hlist_node hash; /* Descriptor hashing and lookup */
|
|
struct list_head fd_info_head; /* Chain of fdinfo_list_entry-s with same ID and type but different pids */
|
|
struct file_desc_ops *ops; /* Associated operations */
|
|
struct list_head fake_master_list; /* To chain in the list of file_desc, which don't
|
|
have a fle in a task, that having permissions */
|
|
};
|
|
```
|
|
After:
|
|
```
|
|
struct file_desc {
|
|
u32 id; /* File id, unique */
|
|
struct hlist_node hash; /* Descriptor hashing and lookup */
|
|
struct list_head fd_info_head; /* Chain of fdinfo_list_entry-s with same ID and type but different pids */
|
|
struct file_desc_ops *ops; /* Associated operations */
|
|
struct list_head fake_master_list; /* To chain in the list of file_desc, which don't
|
|
* have a fle in a task, that having permissions */
|
|
};
|
|
```
|
|
|
|
Example 2:
|
|
|
|
Before:
|
|
```
|
|
enum fsconfig_command {
|
|
FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
|
|
FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
|
|
FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
|
|
FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
|
|
FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
|
|
FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */
|
|
FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
|
|
FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
|
|
};
|
|
```
|
|
After:
|
|
```
|
|
enum fsconfig_command {
|
|
FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
|
|
FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
|
|
FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
|
|
FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
|
|
FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
|
|
FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */
|
|
FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
|
|
FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
|
|
};
|
|
```
|
|
|
|
Example 3:
|
|
|
|
Before:
|
|
```
|
|
ret = libnet_build_tcp(ntohs(sk->dst_addr->v4.sin_port), /* source port */
|
|
ntohs(sk->src_addr->v4.sin_port), /* destination port */
|
|
data->inq_seq, /* sequence number */
|
|
data->outq_seq - data->outq_len, /* acknowledgement num */
|
|
flags, /* control flags */
|
|
data->rcv_wnd, /* window size */
|
|
0, /* checksum */
|
|
10, /* urgent pointer */
|
|
LIBNET_TCP_H + 20, /* TCP packet size */
|
|
NULL, /* payload */
|
|
0, /* payload size */
|
|
l, /* libnet handle */
|
|
0); /* libnet id */
|
|
```
|
|
After:
|
|
```
|
|
ret = libnet_build_tcp(ntohs(sk->dst_addr->v4.sin_port), /* source port */
|
|
ntohs(sk->src_addr->v4.sin_port), /* destination port */
|
|
data->inq_seq, /* sequence number */
|
|
data->outq_seq - data->outq_len, /* acknowledgement num */
|
|
flags, /* control flags */
|
|
data->rcv_wnd, /* window size */
|
|
0, /* checksum */
|
|
10, /* urgent pointer */
|
|
LIBNET_TCP_H + 20, /* TCP packet size */
|
|
NULL, /* payload */
|
|
0, /* payload size */
|
|
l, /* libnet handle */
|
|
0); /* libnet id */
|
|
```
|
|
|
|
Example 4:
|
|
|
|
Before:
|
|
```
|
|
static struct testcase __testcases[] = {
|
|
{ 2, 1, 2, 1, 2, 1 }, /* session00 */
|
|
{ 4, 2, 4, 2, 4, 1 }, /* |\_session00 */
|
|
{ 15, 4, 4, 4, 15, 1 }, /* | |\_session00 */
|
|
{ 16, 4, 4, 4, 15, 1 }, /* | \_session00 */
|
|
{ 17, 4, 4, 4, 17, 0 }, /* | |\_session00 */
|
|
{ 18, 4, 4, 4, 17, 1 }, /* | \_session00 */
|
|
{ 5, 2, 2, 2, 2, 1 }, /* |\_session00 */
|
|
{ 8, 2, 8, 2, 8, 1 }, /* |\_session00 */
|
|
{ 9, 8, 2, 2, 2, 1 }, /* | \_session00 */
|
|
{ 10, 2, 10, 2, 10, 1 }, /* |\_session00 */
|
|
{ 11, 10, 11, 2, 11, 1 }, /* | \_session00 */
|
|
{ 12, 11, 2, 2, 2, 1 }, /* | \_session00 */
|
|
{ 13, 2, 2, 2, 2, 0 }, /* \_session00 */
|
|
{ 3, 13, 2, 2, 2, 1 }, /* session00 */
|
|
{ 6, 2, 6, 2, 6, 0 }, /* \_session00 */
|
|
{ 14, 6, 6, 6, 6, 1 }, /* session00 */
|
|
};
|
|
```
|
|
After:
|
|
```
|
|
static struct testcase __testcases[] = {
|
|
{ 2, 1, 2, 1, 2, 1 }, /* session00 */
|
|
{ 4, 2, 4, 2, 4, 1 }, /* |\_session00 */
|
|
{ 15, 4, 4, 4, 15, 1 }, /* | |\_session00 */
|
|
{ 16, 4, 4, 4, 15, 1 }, /* | \_session00 */
|
|
{ 17, 4, 4, 4, 17, 0 }, /* | |\_session00 */
|
|
{ 18, 4, 4, 4, 17, 1 }, /* | \_session00 */
|
|
{ 5, 2, 2, 2, 2, 1 }, /* |\_session00 */
|
|
{ 8, 2, 8, 2, 8, 1 }, /* |\_session00 */
|
|
{ 9, 8, 2, 2, 2, 1 }, /* | \_session00 */
|
|
{ 10, 2, 10, 2, 10, 1 }, /* |\_session00 */
|
|
{ 11, 10, 11, 2, 11, 1 }, /* | \_session00 */
|
|
{ 12, 11, 2, 2, 2, 1 }, /* | \_session00 */
|
|
{ 13, 2, 2, 2, 2, 0 }, /* \_session00 */
|
|
{ 3, 13, 2, 2, 2, 1 }, /* session00 */
|
|
{ 6, 2, 6, 2, 6, 0 }, /* \_session00 */
|
|
{ 14, 6, 6, 6, 6, 1 }, /* session00 */
|
|
};
|
|
```
|
|
|
|
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
|
|
---
|
|
.clang-format | 2 +-
|
|
scripts/fetch-clang-format.sh | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/.clang-format b/.clang-format
|
|
index dd4ade370..96ba5909f 100644
|
|
--- a/.clang-format
|
|
+++ b/.clang-format
|
|
@@ -15,7 +15,7 @@ AlignConsecutiveAssignments: false
|
|
AlignConsecutiveDeclarations: false
|
|
AlignEscapedNewlines: Left # Unknown to clang-format-4.0
|
|
AlignOperands: true
|
|
-AlignTrailingComments: false
|
|
+AlignTrailingComments: true
|
|
AlignConsecutiveMacros: true
|
|
AllowAllParametersOfDeclarationOnNextLine: false
|
|
AllowShortBlocksOnASingleLine: false
|
|
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
|
|
index c9006c518..0e9545f2d 100755
|
|
--- a/scripts/fetch-clang-format.sh
|
|
+++ b/scripts/fetch-clang-format.sh
|
|
@@ -12,4 +12,5 @@ curl -s "${URL}" | sed -e "
|
|
s,Intended for clang-format >= 4,Intended for clang-format >= 11,g;
|
|
s,ForEachMacros:,ForEachMacros:\n - 'for_each_pstree_item',g;
|
|
s,\(AlignTrailingComments:.*\)$,\1\nAlignConsecutiveMacros: true,g;
|
|
+ s,AlignTrailingComments: false,AlignTrailingComments: true,g;
|
|
" > .clang-format
|
|
--
|
|
2.34.1
|
|
|