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.

Author: DaanDeMeyer

src/analyze/analyze-critical-chain.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "analyze.h"
 #include "analyze-critical-chain.h"
 #include "analyze-time-data.h"
-#include "analyze.h"
 #include "bus-error.h"
 #include "copy.h"
 #include "path-util.h"

src/analyze/analyze-dump.c

@@ -2,8 +2,8 @@
 
 #include "sd-bus.h"
 
-#include "analyze-dump.h"
 #include "analyze.h"
+#include "analyze-dump.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-message-util.h"

src/analyze/analyze-fdstore.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-fdstore.h"
 #include "analyze.h"
+#include "analyze-fdstore.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "fd-util.h"

src/analyze/analyze-image-policy.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-image-policy.h"
 #include "analyze.h"
+#include "analyze-image-policy.h"
 #include "format-table.h"
 #include "image-policy.h"
 #include "terminal-util.h"

src/analyze/analyze-malloc.c

@@ -2,8 +2,8 @@
 
 #include "sd-bus.h"
 
-#include "analyze-malloc.h"
 #include "analyze.h"
+#include "analyze-malloc.h"
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-message-util.h"

src/analyze/analyze-plot.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "analyze.h"
 #include "analyze-plot.h"
 #include "analyze-time-data.h"
-#include "analyze.h"
 #include "bus-error.h"
 #include "bus-map-properties.h"
 #include "format-table.h"

src/analyze/analyze-syscall-filter.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-syscall-filter.h"
 #include "analyze.h"
+#include "analyze-syscall-filter.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "nulstr-util.h"

src/analyze/analyze-time-data.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-time-data.h"
 #include "analyze.h"
+#include "analyze-time-data.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"

src/analyze/analyze-verify-util.c

@@ -4,8 +4,8 @@
 
 #include "all-units.h"
 #include "alloc-util.h"
-#include "analyze-verify-util.h"
 #include "analyze.h"
+#include "analyze-verify-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "log.h"

src/analyze/analyze.c

@@ -55,8 +55,8 @@
 #include "cap-list.h"
 #include "capability-util.h"
 #include "conf-files.h"
-#include "copy.h"
 #include "constants.h"
+#include "copy.h"
 #include "exit-status.h"
 #include "extract-word.h"
 #include "fd-util.h"

src/basic/arphrd-util.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
-#include <netinet/in.h>
 #include <linux/if_arp.h>
 #include <linux/if_infiniband.h>
+#include <netinet/in.h>
 #include <string.h>
 
 #include "arphrd-util.h"

src/basic/cap-list.c

@@ -5,8 +5,8 @@
 
 #include "alloc-util.h"
 #include "bitfield.h"
-#include "capability-util.h"
 #include "cap-list.h"
+#include "capability-util.h"
 #include "extract-word.h"
 #include "log.h"
 #include "macro.h"

src/basic/confidential-virt.c

@@ -9,8 +9,8 @@
 #include <threads.h>
 #include <unistd.h>
 
-#include "confidential-virt-fundamental.h"
 #include "confidential-virt.h"
+#include "confidential-virt-fundamental.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/basic/fs-util.c

@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
+#include <linux/falloc.h>
+#include <linux/magic.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/file.h>
-#include <linux/falloc.h>
-#include <linux/magic.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

src/basic/glob-util.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "dirent-util.h"

src/basic/keyring-util.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "keyring-util.h"
 #include "log.h"
-#include "alloc-util.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
 

src/basic/percent-util.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "parse-util.h"
 #include "percent-util.h"
 #include "string-util.h"
-#include "parse-util.h"
 
 static int parse_parts_value_whole(const char *p, const char *symbol) {
         const char *pc, *n;

src/basic/psi-util.c

@@ -11,8 +11,8 @@
 #include "fileio.h"
 #include "parse-util.h"
 #include "psi-util.h"
-#include "string-util.h"
 #include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 int read_resource_pressure(const char *path, PressureType type, ResourcePressure *ret) {

src/basic/recurse-dir.h

@@ -5,8 +5,8 @@
 #include <limits.h>
 
 #include "errno-list.h"
-#include "stat-util.h"
 #include "macro.h"
+#include "stat-util.h"
 
 typedef enum RecurseDirFlags {
         /* Interpreted by readdir_all() */

src/basic/socket-util.c

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <limits.h>
+#include <linux/if.h>
+#include <net/if.h>
 #include <netdb.h>
 #include <netinet/ip.h>
 #include <poll.h>
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <linux/if.h>
 
 #include "alloc-util.h"
 #include "errno-util.h"

src/basic/socket-util.h

@@ -6,12 +6,12 @@
 #include <linux/if_infiniband.h>
 #include <linux/if_packet.h>
 #include <linux/netlink.h>
-#include <sys/socket.h> /* linux/vms_sockets.h requires 'struct sockaddr' */
 #include <linux/vm_sockets.h>
 #include <netinet/in.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
 

src/basic/sort-util.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "sort-util.h"
 #include "alloc-util.h"
+#include "sort-util.h"
 
 /* hey glibc, APIs with callbacks without a user pointer are so useless */
 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,

src/basic/terminal-util.h

@@ -4,8 +4,8 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
 #include <sys/types.h>
+#include <syslog.h>
 #include <termios.h>
 #include <unistd.h>
 

src/boot/boot.c

@@ -7,8 +7,8 @@
 #include "devicetree.h"
 #include "drivers.h"
 #include "efi-string-table.h"
-#include "efivars-fundamental.h"
 #include "efivars.h"
+#include "efivars-fundamental.h"
 #include "export-vars.h"
 #include "graphics.h"
 #include "initrd.h"

src/boot/chid.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 #pragma once
 
-#include "efi.h"
 #include "chid-fundamental.h"
+#include "efi.h"
 
 /* A .hwids PE section consists of a series of 'Device' structures. A 'Device' structure binds a CHID to some
  * resource, for now only Devicetree blobs. Designed to be extensible to other types of resources, should the

src/boot/efi-string.c

@@ -7,6 +7,7 @@
 #  include "util.h"
 #else
 #  include <stdlib.h>
+
 #  include "alloc-util.h"
 #  define xnew(t, n) ASSERT_SE_PTR(new(t, n))
 #  define xmalloc(n) ASSERT_SE_PTR(malloc(n))

src/bootctl/bootctl-set-efivar.c

@@ -5,8 +5,8 @@
 
 #include "bootctl.h"
 #include "bootctl-set-efivar.h"
-#include "efivars.h"
 #include "efi-loader.h"
+#include "efivars.h"
 #include "stdio-util.h"
 #include "utf8.h"
 #include "virt.h"

src/core/all-units.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "unit.h"
-
 #include "automount.h"
 #include "device.h"
 #include "mount.h"
@@ -14,3 +12,4 @@
 #include "swap.h"
 #include "target.h"
 #include "timer.h"
+#include "unit.h"

src/core/automount.c

@@ -21,10 +21,10 @@
 #include "fstab-util.h"
 #include "io-util.h"
 #include "label-util.h"
-#include "mkdir-label.h"
 #include "manager.h"
-#include "mount-util.h"
+#include "mkdir-label.h"
 #include "mount.h"
+#include "mount-util.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -34,8 +34,8 @@
 #include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD]    = UNIT_INACTIVE,

src/core/bpf-firewall.c

@@ -1,13 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/bpf_insn.h>
 #include <net/ethernet.h>
+#include <net/if.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <stddef.h>
@@ -23,8 +22,8 @@
 #include "manager.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
-#include "unit.h"
 #include "strv.h"
+#include "unit.h"
 #include "virt.h"
 
 enum {

src/core/bpf-restrict-ifaces.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "fd-util.h"
 #include "bpf-restrict-ifaces.h"
+#include "fd-util.h"
 #include "netlink-util.h"
 #include "unit.h"
 

src/core/bpf-socket-bind.c

@@ -4,8 +4,8 @@
 #include <bpf/bpf.h>
 #endif
 
-#include "fd-util.h"
 #include "bpf-socket-bind.h"
+#include "fd-util.h"
 #include "unit.h"
 
 #if BPF_FRAMEWORK

src/core/bpf/restrict_fs/restrict-fs.bpf.c

@@ -6,14 +6,14 @@
  * fine given that LGPL-2.1-or-later downgrades to GPL if needed.
  */
 
-#include <linux/types.h>
-#include <linux/bpf.h>
-#include <bpf/bpf_helpers.h>
-#include <bpf/bpf_tracing.h>
-#include <bpf/bpf_core_read.h>
 #include <errno.h>
+#include <linux/bpf.h>
+#include <linux/types.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <bpf/bpf_core_read.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_tracing.h>
 
 struct super_block {
         unsigned long s_magic;

src/core/bpf/socket_bind/socket-bind.bpf.c

@@ -10,12 +10,12 @@
 /* <linux/types.h> must precede <bpf/bpf_helpers.h> due to
  * <bpf/bpf_helpers.h> does not depend from type header by design.
  */
-#include <linux/types.h>
-#include <bpf/bpf_endian.h>
-#include <bpf/bpf_helpers.h>
 #include <linux/bpf.h>
+#include <linux/types.h>
 #include <netinet/in.h>
 #include <stdbool.h>
+#include <bpf/bpf_endian.h>
+#include <bpf/bpf_helpers.h>
 
 /*
  * max_entries is set from user space with bpf_map__set_max_entries helper.