Skip to content

Commit 8272b1f

Browse files
committed
tree-wide: Sort includes
This was done by running a locally built clang-format with llvm/llvm-project#137617 applied on all .c and .h files. This commit fixes numerous cases where includes weren't sorted alphabetically and moves all <linux/*.h> includes to the very bottom after our own includes to avoid conflicts when a linux header is included before a glibc one such as <netinet/in.h> or <net/if.h> which causes compilation failures.
1 parent 766eca5 commit 8272b1f

File tree

573 files changed

+1089
-902
lines changed

Some content is hidden

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

573 files changed

+1089
-902
lines changed

src/analyze/analyze-architectures.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.h"
43
#include "analyze-architectures.h"
4+
#include "analyze.h"
55
#include "format-table.h"
66

77
static int add_arch(Table *t, Architecture a) {

src/analyze/analyze-blame.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"
43
#include "analyze-blame.h"
54
#include "analyze-time-data.h"
5+
#include "analyze.h"
66
#include "format-table.h"
77

88
int verb_blame(int argc, char *argv[], void *userdata) {

src/analyze/analyze-calendar.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.h"
43
#include "analyze-calendar.h"
4+
#include "analyze.h"
55
#include "calendarspec.h"
66
#include "format-table.h"
77
#include "terminal-util.h"

src/analyze/analyze-capability.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.h"
43
#include "analyze-capability.h"
4+
#include "analyze.h"
55
#include "cap-list.h"
66
#include "capability-util.h"
77
#include "format-table.h"

src/analyze/analyze-cat-config.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.h"
43
#include "analyze-cat-config.h"
4+
#include "analyze.h"
55
#include "conf-files.h"
66
#include "constants.h"
77
#include "path-util.h"

src/analyze/analyze-chid.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.h"
43
#include "analyze-chid.h"
4+
#include "analyze.h"
55
#include "chid-fundamental.h"
66
#include "efi-api.h"
77
#include "escape.h"

src/analyze/analyze-condition.c

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

33
#include <stdlib.h>
44

5-
#include "analyze.h"
65
#include "analyze-condition.h"
76
#include "analyze-verify-util.h"
7+
#include "analyze.h"
88
#include "condition.h"
99
#include "conf-parser.h"
1010
#include "load-fragment.h"

src/analyze/analyze-dot.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.h"
43
#include "analyze-dot.h"
4+
#include "analyze.h"
55
#include "bus-error.h"
66
#include "bus-locator.h"
77
#include "bus-unit-util.h"

src/analyze/analyze-exit-status.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.h"
43
#include "analyze-exit-status.h"
4+
#include "analyze.h"
55
#include "exit-status.h"
66
#include "format-table.h"
77

src/analyze/analyze-filesystems.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.h"
43
#include "analyze-filesystems.h"
4+
#include "analyze.h"
55
#include "fileio.h"
66
#include "filesystems.h"
77
#include "set.h"

src/analyze/analyze-has-tpm2.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.h"
43
#include "analyze-has-tpm2.h"
4+
#include "analyze.h"
55
#include "tpm2-util.h"
66

77
int verb_has_tpm2(int argc, char **argv, void *userdata) {

src/analyze/analyze-inspect-elf.c

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

33
#include "sd-json.h"
44

5-
#include "analyze.h"
65
#include "analyze-inspect-elf.h"
6+
#include "analyze.h"
77
#include "chase.h"
88
#include "elf-util.h"
99
#include "errno-util.h"

src/analyze/analyze-log-control.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.h"
43
#include "analyze-log-control.h"
4+
#include "analyze.h"
55
#include "verb-log-control.h"
66

77
int verb_log_control(int argc, char *argv[], void *userdata) {

src/analyze/analyze-pcrs.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.h"
43
#include "analyze-pcrs.h"
4+
#include "analyze.h"
55
#include "fileio.h"
66
#include "format-table.h"
77
#include "hexdecoct.h"

src/analyze/analyze-security.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#include <sys/utsname.h>
44

55
#include "af-list.h"
6-
#include "analyze.h"
76
#include "analyze-security.h"
87
#include "analyze-verify.h"
8+
#include "analyze.h"
99
#include "bus-error.h"
1010
#include "bus-locator.h"
1111
#include "bus-map-properties.h"

src/analyze/analyze-service-watchdogs.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.h"
43
#include "analyze-service-watchdogs.h"
4+
#include "analyze.h"
55
#include "bus-error.h"
66
#include "bus-locator.h"
77
#include "parse-util.h"

src/analyze/analyze-smbios11.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.h"
43
#include "analyze-smbios11.h"
4+
#include "analyze.h"
55
#include "escape.h"
66
#include "smbios11.h"
77
#include "virt.h"

src/analyze/analyze-srk.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.h"
43
#include "analyze-srk.h"
4+
#include "analyze.h"
55
#include "fileio.h"
66
#include "tpm2-util.h"
77

src/analyze/analyze-time.c

Lines changed: 2 additions & 2 deletions
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"
4-
#include "analyze-time.h"
53
#include "analyze-time-data.h"
4+
#include "analyze-time.h"
5+
#include "analyze.h"
66

77
int verb_time(int argc, char *argv[], void *userdata) {
88
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;

src/analyze/analyze-timespan.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.h"
43
#include "analyze-timespan.h"
4+
#include "analyze.h"
55
#include "calendarspec.h"
66
#include "format-table.h"
77
#include "glyph-util.h"

src/analyze/analyze-timestamp.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.h"
43
#include "analyze-timestamp.h"
4+
#include "analyze.h"
55
#include "format-table.h"
66
#include "terminal-util.h"
77

src/analyze/analyze-unit-files.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.h"
43
#include "analyze-unit-files.h"
4+
#include "analyze.h"
55
#include "path-lookup.h"
66
#include "strv.h"
77

src/analyze/analyze-unit-paths.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.h"
43
#include "analyze-unit-paths.h"
4+
#include "analyze.h"
55
#include "path-lookup.h"
66
#include "strv.h"
77

src/analyze/analyze-verify.c

Lines changed: 2 additions & 2 deletions
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"
4-
#include "analyze-verify.h"
53
#include "analyze-verify-util.h"
4+
#include "analyze-verify.h"
5+
#include "analyze.h"
66
#include "copy.h"
77
#include "rm-rf.h"
88
#include "tmpfile-util.h"

src/analyze/analyze.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "sd-bus.h"
1313

1414
#include "alloc-util.h"
15-
#include "analyze.h"
1615
#include "analyze-architectures.h"
1716
#include "analyze-blame.h"
1817
#include "analyze-calendar.h"
@@ -39,13 +38,14 @@
3938
#include "analyze-smbios11.h"
4039
#include "analyze-srk.h"
4140
#include "analyze-syscall-filter.h"
42-
#include "analyze-time.h"
4341
#include "analyze-time-data.h"
42+
#include "analyze-time.h"
4443
#include "analyze-timespan.h"
4544
#include "analyze-timestamp.h"
4645
#include "analyze-unit-files.h"
4746
#include "analyze-unit-paths.h"
4847
#include "analyze-verify.h"
48+
#include "analyze.h"
4949
#include "build.h"
5050
#include "bus-error.h"
5151
#include "bus-locator.h"
@@ -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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
#include <errno.h>
44
#include <netinet/in.h>
5-
#include <linux/if_arp.h>
6-
#include <linux/if_infiniband.h>
75
#include <string.h>
86

97
#include "arphrd-util.h"
108
#include "macro.h"
119

10+
#include <linux/if_arp.h>
11+
#include <linux/if_infiniband.h>
12+
1213
static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
1314

1415
#include "arphrd-from-name.h"

src/basic/audit-util.c

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

33
#include <errno.h>
4-
#include <linux/audit.h>
5-
#include <linux/netlink.h>
64
#include <stdio.h>
75
#include <sys/socket.h>
86

@@ -19,6 +17,9 @@
1917
#include "user-util.h"
2018
#include "virt.h"
2119

20+
#include <linux/audit.h>
21+
#include <linux/netlink.h>
22+
2223
static int audit_read_field(const PidRef *pid, const char *field, char **ret) {
2324
int r;
2425

src/basic/btrfs.c

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

3-
#include <linux/btrfs.h>
43
#include <sys/ioctl.h>
54

65
#include "btrfs.h"
76
#include "fd-util.h"
87
#include "fs-util.h"
98
#include "path-util.h"
109

10+
#include <linux/btrfs.h>
11+
1112
int btrfs_validate_subvolume_name(const char *name) {
1213

1314
if (!filename_is_valid(name))

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/capability-util.c

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

33
#include <errno.h>
4-
#include <linux/prctl.h>
54
#include <stdatomic.h>
65
#include <stdio.h>
76
#include <stdlib.h>
@@ -24,6 +23,8 @@
2423
#include "stat-util.h"
2524
#include "user-util.h"
2625

26+
#include <linux/prctl.h>
27+
2728
int have_effective_cap(int value) {
2829
_cleanup_cap_free_ cap_t cap = NULL;
2930
cap_flag_value_t fv = CAP_CLEAR; /* To avoid false-positive use-of-uninitialized-value error reported

src/basic/chase.c

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

3-
#include <linux/magic.h>
4-
53
#include "alloc-util.h"
64
#include "chase.h"
75
#include "fd-util.h"
@@ -13,6 +11,8 @@
1311
#include "string-util.h"
1412
#include "user-util.h"
1513

14+
#include <linux/magic.h>
15+
1616
bool unsafe_transition(const struct stat *a, const struct stat *b) {
1717
/* Returns true if the transition from a to b is safe, i.e. that we never transition from unprivileged to
1818
* privileged files or directories. Why bother? So that unprivileged code can't symlink to privileged files

src/basic/ether-addr-util.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* SPDX-License-Identifier: LGPL-2.1-or-later */
22
#pragma once
33

4-
#include <linux/if_infiniband.h>
54
#include <net/ethernet.h>
65
#include <stdbool.h>
76

@@ -10,6 +9,8 @@
109
#include "macro.h"
1110
#include "memory-util.h"
1211

12+
#include <linux/if_infiniband.h>
13+
1314
/* This is MAX_ADDR_LEN as defined in linux/netdevice.h, but net/if_arp.h
1415
* defines a macro of the same name with a much lower size. */
1516
#define HW_ADDR_MAX_SIZE 32

src/basic/fd-util.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include <errno.h>
44
#include <fcntl.h>
5-
#include <linux/kcmp.h>
6-
#include <linux/magic.h>
75
#include <sys/ioctl.h>
86
#include <sys/resource.h>
97
#include <sys/stat.h>
@@ -30,6 +28,9 @@
3028
#include "stdio-util.h"
3129
#include "tmpfile-util.h"
3230

31+
#include <linux/kcmp.h>
32+
#include <linux/magic.h>
33+
3334
/* The maximum number of iterations in the loop to close descriptors in the fallback case
3435
* when /proc/self/fd/ is inaccessible. */
3536
#define MAX_FD_LOOP_LIMIT (1024*1024)

0 commit comments

Comments
 (0)