Skip to content

Commit 8b52f06

Browse files
committed
tree-wide: Sort includes
This was done by running a locally built clang-format with llvm/llvm-project#137617 and llvm/llvm-project#137840 applied on all .c and .h files.
1 parent 3021ce2 commit 8b52f06

File tree

465 files changed

+625
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

465 files changed

+625
-645
lines changed

src/analyze/analyze-critical-chain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

3+
#include "analyze.h"
34
#include "analyze-critical-chain.h"
45
#include "analyze-time-data.h"
5-
#include "analyze.h"
66
#include "bus-error.h"
77
#include "copy.h"
88
#include "path-util.h"

src/analyze/analyze-dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "sd-bus.h"
44

5-
#include "analyze-dump.h"
65
#include "analyze.h"
6+
#include "analyze-dump.h"
77
#include "bus-error.h"
88
#include "bus-locator.h"
99
#include "bus-message-util.h"

src/analyze/analyze-fdstore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

3-
#include "analyze-fdstore.h"
43
#include "analyze.h"
4+
#include "analyze-fdstore.h"
55
#include "bus-error.h"
66
#include "bus-locator.h"
77
#include "fd-util.h"

src/analyze/analyze-image-policy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

3-
#include "analyze-image-policy.h"
43
#include "analyze.h"
4+
#include "analyze-image-policy.h"
55
#include "format-table.h"
66
#include "image-policy.h"
77
#include "terminal-util.h"

src/analyze/analyze-malloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "sd-bus.h"
44

5-
#include "analyze-malloc.h"
65
#include "analyze.h"
6+
#include "analyze-malloc.h"
77
#include "bus-error.h"
88
#include "bus-internal.h"
99
#include "bus-message-util.h"

src/analyze/analyze-plot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

3+
#include "analyze.h"
34
#include "analyze-plot.h"
45
#include "analyze-time-data.h"
5-
#include "analyze.h"
66
#include "bus-error.h"
77
#include "bus-map-properties.h"
88
#include "format-table.h"

src/analyze/analyze-syscall-filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

3-
#include "analyze-syscall-filter.h"
43
#include "analyze.h"
4+
#include "analyze-syscall-filter.h"
55
#include "fd-util.h"
66
#include "fileio.h"
77
#include "nulstr-util.h"

src/analyze/analyze-time-data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

3-
#include "analyze-time-data.h"
43
#include "analyze.h"
4+
#include "analyze-time-data.h"
55
#include "bus-error.h"
66
#include "bus-locator.h"
77
#include "bus-map-properties.h"

src/analyze/analyze-verify-util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include "all-units.h"
66
#include "alloc-util.h"
7-
#include "analyze-verify-util.h"
87
#include "analyze.h"
8+
#include "analyze-verify-util.h"
99
#include "bus-error.h"
1010
#include "bus-util.h"
1111
#include "log.h"

src/analyze/analyze.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
#include "cap-list.h"
5656
#include "capability-util.h"
5757
#include "conf-files.h"
58-
#include "copy.h"
5958
#include "constants.h"
59+
#include "copy.h"
6060
#include "exit-status.h"
6161
#include "extract-word.h"
6262
#include "fd-util.h"

src/basic/arphrd-util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

33
#include <errno.h>
4-
#include <netinet/in.h>
54
#include <linux/if_arp.h>
65
#include <linux/if_infiniband.h>
6+
#include <netinet/in.h>
77
#include <string.h>
88

99
#include "arphrd-util.h"

src/basic/cap-list.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include "alloc-util.h"
77
#include "bitfield.h"
8-
#include "capability-util.h"
98
#include "cap-list.h"
9+
#include "capability-util.h"
1010
#include "extract-word.h"
1111
#include "log.h"
1212
#include "macro.h"

src/basic/confidential-virt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <threads.h>
1010
#include <unistd.h>
1111

12-
#include "confidential-virt-fundamental.h"
1312
#include "confidential-virt.h"
13+
#include "confidential-virt-fundamental.h"
1414
#include "errno-util.h"
1515
#include "fd-util.h"
1616
#include "fileio.h"

src/basic/fs-util.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

33
#include <errno.h>
4+
#include <linux/falloc.h>
5+
#include <linux/magic.h>
46
#include <stddef.h>
57
#include <stdlib.h>
68
#include <sys/file.h>
7-
#include <linux/falloc.h>
8-
#include <linux/magic.h>
99
#include <unistd.h>
1010

1111
#include "alloc-util.h"

src/basic/glob-util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22

33
#include <errno.h>
4-
#include <sys/types.h>
54
#include <sys/stat.h>
5+
#include <sys/types.h>
66
#include <unistd.h>
77

88
#include "dirent-util.h"

src/basic/include/linux/auto_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#ifndef _LINUX_AUTO_FS_H
1414
#define _LINUX_AUTO_FS_H
1515

16-
#include <linux/types.h>
1716
#include <linux/limits.h>
17+
#include <linux/types.h>
1818
#include <sys/ioctl.h>
1919

2020
#define AUTOFS_PROTO_VERSION 5

src/basic/include/linux/bpf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#ifndef __LINUX_BPF_H__
99
#define __LINUX_BPF_H__
1010

11-
#include <linux/types.h>
1211
#include <linux/bpf_common.h>
12+
#include <linux/types.h>
1313

1414
/* Extended instruction set based on top of classic BPF */
1515

src/basic/include/linux/btrfs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
extern "C" {
2525
#endif
2626

27-
#include <linux/types.h>
28-
#include <linux/ioctl.h>
2927
#include <linux/fs.h>
28+
#include <linux/ioctl.h>
29+
#include <linux/types.h>
3030

3131
#define BTRFS_IOCTL_MAGIC 0x94
3232
#define BTRFS_VOL_NAME_MAX 255

src/basic/include/linux/cfm_bridge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#ifndef _LINUX_CFM_BRIDGE_H_
44
#define _LINUX_CFM_BRIDGE_H_
55

6-
#include <linux/types.h>
76
#include <linux/if_ether.h>
7+
#include <linux/types.h>
88

99
#define ETHER_HEADER_LENGTH (6+6+4+2)
1010
#define CFM_MAID_LENGTH 48

src/basic/include/linux/ethtool.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
#ifndef _LINUX_ETHTOOL_H
1515
#define _LINUX_ETHTOOL_H
1616

17+
#include <limits.h> /* for INT_MAX */
1718
#include <linux/const.h>
18-
#include <linux/types.h>
1919
#include <linux/if_ether.h>
20-
21-
#include <limits.h> /* for INT_MAX */
20+
#include <linux/types.h>
2221

2322
/* All structures exposed to userland should be defined such that they
2423
* have the same layout for 32-bit and 64-bit userland.

src/basic/include/linux/fib_rules.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#ifndef __LINUX_FIB_RULES_H
33
#define __LINUX_FIB_RULES_H
44

5-
#include <linux/types.h>
65
#include <linux/rtnetlink.h>
6+
#include <linux/types.h>
77

88
/* rule is permanent, and cannot be deleted */
99
#define FIB_RULE_PERMANENT 0x00000001

src/basic/include/linux/filter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#define __LINUX_FILTER_H__
88

99

10-
#include <linux/types.h>
1110
#include <linux/bpf_common.h>
11+
#include <linux/types.h>
1212

1313
/*
1414
* Current version of the filter code architecture.

src/basic/include/linux/fs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
1111
*/
1212

13-
#include <linux/limits.h>
13+
#include <linux/fscrypt.h>
1414
#include <linux/ioctl.h>
15+
#include <linux/limits.h>
1516
#include <linux/types.h>
16-
#include <linux/fscrypt.h>
1717

1818
/* Use of MS_* flags within the kernel is restricted to core mount(2) code. */
1919
#include <linux/mount.h>

src/basic/include/linux/genetlink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#ifndef __LINUX_GENERIC_NETLINK_H
33
#define __LINUX_GENERIC_NETLINK_H
44

5-
#include <linux/types.h>
65
#include <linux/netlink.h>
6+
#include <linux/types.h>
77

88
#define GENL_NAMSIZ 16 /* length of family name */
99

src/basic/include/linux/if.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#define _LINUX_IF_H
2222

2323
#include <linux/libc-compat.h> /* for compatibility with glibc */
24-
#include <linux/types.h> /* for "__kernel_caddr_t" et al */
2524
#include <linux/socket.h> /* for "struct sockaddr" et al */
25+
#include <linux/types.h> /* for "__kernel_caddr_t" et al */
2626
/* for "__user" et al */
2727

2828
#include <sys/socket.h> /* for struct sockaddr. */

src/basic/include/linux/if_addr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#ifndef __LINUX_IF_ADDR_H
33
#define __LINUX_IF_ADDR_H
44

5-
#include <linux/types.h>
65
#include <linux/netlink.h>
6+
#include <linux/types.h>
77

88
struct ifaddrmsg {
99
__u8 ifa_family;

src/basic/include/linux/if_bonding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
#define _LINUX_IF_BONDING_H
4646

4747
#include <linux/if.h>
48-
#include <linux/types.h>
4948
#include <linux/if_ether.h>
49+
#include <linux/types.h>
5050

5151
/* userland - kernel ABI version (2003/05/08) */
5252
#define BOND_ABI_VERSION 2

src/basic/include/linux/if_bridge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#ifndef _LINUX_IF_BRIDGE_H
1515
#define _LINUX_IF_BRIDGE_H
1616

17-
#include <linux/types.h>
1817
#include <linux/if_ether.h>
1918
#include <linux/in6.h>
19+
#include <linux/types.h>
2020

2121
#define SYSFS_BRIDGE_ATTR "bridge"
2222
#define SYSFS_BRIDGE_FDB "brforward"

src/basic/include/linux/if_link.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#ifndef _LINUX_IF_LINK_H
33
#define _LINUX_IF_LINK_H
44

5-
#include <linux/types.h>
65
#include <linux/netlink.h>
6+
#include <linux/types.h>
77

88
/* This struct should be in sync with struct rtnl_link_stats64 */
99
struct rtnl_link_stats {

src/basic/include/linux/if_tun.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#ifndef __IF_TUN_H
1818
#define __IF_TUN_H
1919

20-
#include <linux/types.h>
21-
#include <linux/if_ether.h>
2220
#include <linux/filter.h>
21+
#include <linux/if_ether.h>
22+
#include <linux/types.h>
2323

2424
/* Read queue size */
2525
#define TUN_READQ_SIZE 500

src/basic/include/linux/if_tunnel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#ifndef _IF_TUNNEL_H_
33
#define _IF_TUNNEL_H_
44

5-
#include <linux/types.h>
5+
#include <asm/byteorder.h>
66
#include <linux/if.h>
7-
#include <linux/ip.h>
87
#include <linux/in6.h>
9-
#include <asm/byteorder.h>
8+
#include <linux/ip.h>
9+
#include <linux/types.h>
1010

1111

1212
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)

src/basic/include/linux/in.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#ifndef _LINUX_IN_H
2020
#define _LINUX_IN_H
2121

22-
#include <linux/types.h>
23-
#include <linux/stddef.h>
2422
#include <linux/libc-compat.h>
2523
#include <linux/socket.h>
24+
#include <linux/stddef.h>
25+
#include <linux/types.h>
2626

2727
#if __UAPI_DEF_IN_IPPROTO
2828
/* Standard well-defined IP protocols. */

src/basic/include/linux/in6.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#ifndef _LINUX_IN6_H
2323
#define _LINUX_IN6_H
2424

25-
#include <linux/types.h>
2625
#include <linux/libc-compat.h>
26+
#include <linux/types.h>
2727

2828
/*
2929
* IPv6 address structure

src/basic/include/linux/input.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#define _INPUT_H
1111

1212

13-
#include <sys/time.h>
13+
#include <linux/types.h>
1414
#include <sys/ioctl.h>
15+
#include <sys/time.h>
1516
#include <sys/types.h>
16-
#include <linux/types.h>
1717

1818
#include "input-event-codes.h"
1919

src/basic/include/linux/ip.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
*/
1818
#ifndef _LINUX_IP_H
1919
#define _LINUX_IP_H
20-
#include <linux/types.h>
21-
#include <linux/stddef.h>
2220
#include <asm/byteorder.h>
21+
#include <linux/stddef.h>
22+
#include <linux/types.h>
2323

2424
#define IPTOS_TOS_MASK 0x1E
2525
#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK)

src/basic/include/linux/ip6_tunnel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#ifndef _IP6_TUNNEL_H
33
#define _IP6_TUNNEL_H
44

5-
#include <linux/types.h>
65
#include <linux/if.h> /* For IFNAMSIZ. */
76
#include <linux/in6.h> /* For struct in6_addr. */
7+
#include <linux/types.h>
88

99
#define IPV6_TLV_TNL_ENCAP_LIMIT 4
1010
#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4

0 commit comments

Comments
 (0)