From cf0fbc49e67b55f8d346fc94de28c90113505297 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Mon, 16 Nov 2015 22:09:36 +0100 Subject: [PATCH] tree-wide: sort includes Sort the includes accoding to the new coding style. --- src/backlight/backlight.c | 3 +-- src/basic/af-list.c | 6 +++--- src/basic/arphrd-list.c | 4 ++-- src/basic/calendarspec.c | 2 +- src/basic/cap-list.c | 2 +- src/basic/errno-list.c | 4 ++-- src/basic/exit-status.c | 4 ++-- src/basic/fdset.c | 2 +- src/basic/fileio-label.c | 4 ++-- src/basic/json.c | 2 +- src/basic/label.c | 2 +- src/basic/lockfile-util.c | 8 ++++---- src/basic/login-util.c | 2 +- src/basic/mempool.c | 2 +- src/basic/mkdir-label.c | 2 +- src/basic/mkdir.c | 2 +- src/basic/selinux-util.c | 6 +++--- src/basic/sigbus.c | 2 +- src/basic/siphash24.c | 3 +-- src/basic/strv.c | 2 +- src/basic/strxcpyx.c | 1 + src/basic/user-util.c | 2 +- src/basic/utf8.c | 4 ++-- src/basic/util.c | 6 +++--- src/boot/efi/boot.c | 6 +++--- src/boot/efi/console.c | 2 +- src/boot/efi/graphics.c | 2 +- src/boot/efi/linux.c | 2 +- src/boot/efi/pefile.c | 2 +- src/boot/efi/splash.c | 2 +- src/boot/efi/stub.c | 6 +++--- src/bootchart/svg.c | 14 +++++++------- src/bus-proxyd/stdio-bridge.c | 2 +- src/core/audit-fd.c | 5 +++-- src/core/dbus-automount.c | 2 +- src/core/dbus-busname.c | 2 +- src/core/dbus-device.c | 4 ++-- src/core/dbus-kill.c | 5 ++--- src/core/dbus-mount.c | 2 +- src/core/dbus-path.c | 2 +- src/core/dbus-slice.c | 4 ++-- src/core/dbus-swap.c | 2 +- src/core/dbus-target.c | 2 +- src/core/device.c | 3 +-- src/core/hostname-setup.c | 2 +- src/core/ima-setup.c | 2 +- src/core/kmod-setup.c | 6 +++--- src/core/load-dropin.c | 6 +++--- src/core/load-fragment.c | 2 +- src/core/locale-setup.c | 2 +- src/core/main.c | 2 +- src/core/mount-setup.c | 4 ++-- src/core/selinux-access.c | 4 ++-- src/core/selinux-setup.c | 2 +- src/core/slice.c | 2 +- src/core/swap.c | 3 +-- src/core/transaction.c | 2 +- src/core/umount.c | 3 +-- src/fsck/fsck.c | 8 ++++---- src/gpt-auto-generator/gpt-auto-generator.c | 6 +++--- src/hibernate-resume/hibernate-resume.c | 2 +- src/hostname/hostnamed.c | 2 +- src/import/aufs-util.c | 2 +- src/import/export-raw.c | 4 ++++ src/import/pull-tar.c | 2 +- src/initctl/initctl.c | 6 +++--- src/journal-remote/journal-upload-journal.c | 3 +-- src/journal-remote/microhttpd-util.c | 2 +- src/journal/audit-type.c | 5 ++--- src/journal/journal-authenticate.c | 2 +- src/journal/journal-qrcode.c | 7 +++---- src/journal/journal-verify.c | 4 ++-- src/journal/journald-console.c | 2 +- src/journal/journald-kmsg.c | 2 +- src/journal/journald-rate-limit.c | 2 +- src/journal/journald-server.c | 2 +- src/journal/journald-wall.c | 2 +- src/journal/journald.c | 7 +++---- src/journal/lookup3.c | 4 ++-- src/journal/mmap-cache.c | 4 ++-- src/journal/test-catalog.c | 4 ++-- src/journal/test-journal-enum.c | 2 +- src/journal/test-journal-interleaving.c | 2 +- src/journal/test-journal-verify.c | 2 +- src/journal/test-journal.c | 6 +++--- src/libsystemd-network/dhcp-identifier.c | 2 +- src/libsystemd-network/dhcp-option.c | 4 ++-- src/libsystemd-network/dhcp-packet.c | 5 ++--- src/libsystemd-network/dhcp6-option.c | 2 +- src/libsystemd-network/lldp-port.c | 4 ++-- src/libsystemd-network/lldp-tlv.c | 2 +- src/libsystemd-network/network-internal.c | 2 +- src/libsystemd-network/test-acd.c | 8 ++++---- src/libsystemd-network/test-dhcp-client.c | 2 +- src/libsystemd-network/test-dhcp-option.c | 4 ++-- src/libsystemd/sd-bus/bus-bloom.c | 4 ++-- src/libsystemd/sd-bus/bus-common-errors.c | 3 ++- src/libsystemd/sd-bus/bus-container.c | 2 +- src/libsystemd/sd-bus/bus-control.c | 2 +- src/libsystemd/sd-bus/bus-error.c | 2 +- src/libsystemd/sd-bus/bus-gvariant.c | 2 +- src/libsystemd/sd-bus/bus-objects.c | 2 +- src/libsystemd/sd-bus/bus-slot.c | 2 +- src/libsystemd/sd-bus/sd-bus.c | 8 ++++---- src/libsystemd/sd-bus/test-bus-chat.c | 6 +++--- src/libsystemd/sd-bus/test-bus-creds.c | 1 + src/libsystemd/sd-bus/test-bus-error.c | 3 ++- src/libsystemd/sd-bus/test-bus-introspect.c | 2 +- src/libsystemd/sd-bus/test-bus-marshal.c | 4 ++-- src/libsystemd/sd-bus/test-bus-match.c | 7 +++---- src/libsystemd/sd-bus/test-bus-objects.c | 2 +- src/libsystemd/sd-bus/test-bus-signature.c | 6 +++--- src/libsystemd/sd-bus/test-bus-zero-copy.c | 2 +- src/libsystemd/sd-id128/sd-id128.c | 2 +- src/libsystemd/sd-netlink/local-addresses.c | 4 ++-- src/libsystemd/sd-netlink/netlink-util.c | 2 +- src/libsystemd/sd-netlink/test-local-addresses.c | 2 +- src/libsystemd/sd-utf8/sd-utf8.c | 2 +- src/libudev/libudev-device-private.c | 3 +-- src/libudev/libudev-device.c | 2 +- src/libudev/libudev-enumerate.c | 2 +- src/libudev/libudev-monitor.c | 3 +-- src/libudev/libudev-queue.c | 6 +++--- src/libudev/libudev-util.c | 3 +-- src/libudev/libudev.c | 3 +-- src/login/logind-core.c | 4 ++-- src/login/logind-session-device.c | 3 +-- src/login/logind-session.c | 1 - src/login/logind-utmp.c | 2 +- src/login/logind.c | 2 +- src/login/sysfs-show.c | 3 +-- src/login/test-login-shared.c | 2 +- src/login/test-login-tables.c | 1 - src/machine-id-setup/machine-id-setup-main.c | 2 +- src/machine/machine.c | 2 +- src/machine/test-machine-tables.c | 1 - src/network/networkctl.c | 1 - src/network/networkd-fdb.c | 2 +- src/network/networkd-ipv4ll.c | 2 +- src/network/networkd-link-bus.c | 5 ++--- src/network/networkd-netdev-bond.c | 2 +- src/network/networkd-netdev-bridge.c | 2 +- src/network/networkd-netdev-tuntap.c | 2 +- src/network/networkd-netdev-veth.c | 1 + src/network/networkd-netdev-vxlan.c | 5 +++-- src/network/test-network-tables.c | 9 ++++----- src/network/test-network.c | 4 ++-- src/nspawn/nspawn-network.c | 4 ++-- src/quotacheck/quotacheck.c | 2 +- src/remount-fs/remount-fs.c | 4 ++-- src/resolve-host/resolve-host.c | 2 +- src/resolve/resolved-llmnr.c | 2 +- src/rfkill/rfkill.c | 2 +- src/run/run.c | 2 +- src/shared/acl-util.c | 2 +- src/shared/acpi-fpdt.c | 2 +- src/shared/architecture.c | 2 +- src/shared/boot-timestamps.c | 2 +- src/shared/clean-ipc.c | 2 +- src/shared/efivars.c | 4 ++-- src/shared/firewall-util.c | 2 +- src/shared/path-lookup.c | 12 ++++++------ src/shared/ptyfwd.c | 2 +- src/shared/seccomp-util.c | 2 +- src/shared/spawn-ask-password-agent.c | 2 +- src/shared/spawn-polkit-agent.c | 6 +++--- src/shared/sysctl-util.c | 2 +- src/shared/watchdog.c | 6 +++--- src/test/test-architecture.c | 4 ++-- src/test/test-boot-timestamps.c | 6 +++--- src/test/test-cgroup-mask.c | 4 ++-- src/test/test-engine.c | 4 ++-- src/test/test-fileio.c | 2 +- src/test/test-firewall-util.c | 2 +- src/test/test-hashmap.c | 2 +- src/test/test-install.c | 2 +- src/test/test-job-type.c | 2 +- src/test/test-libudev.c | 1 - src/test/test-locale-util.c | 2 +- src/test/test-log.c | 2 +- src/test/test-loopback.c | 4 ++-- src/test/test-ns.c | 2 +- src/test/test-ratelimit.c | 2 +- src/test/test-sched-prio.c | 2 +- src/test/test-siphash24.c | 2 +- src/test/test-sleep.c | 2 +- src/test/test-tables.c | 5 ++--- src/test/test-terminal-util.c | 2 +- src/test/test-time.c | 2 +- src/test/test-unaligned.c | 2 +- src/test/test-utf8.c | 2 +- src/test/test-watchdog.c | 2 +- src/udev/ata_id/ata_id.c | 3 +-- src/udev/cdrom_id/cdrom_id.c | 3 +-- src/udev/mtd_probe/mtd_probe.c | 8 ++++---- src/udev/mtd_probe/probe_smartmedia.c | 9 +++++---- src/udev/scsi_id/scsi_id.c | 3 +-- src/udev/scsi_id/scsi_serial.c | 3 +-- src/udev/udev-builtin-uaccess.c | 2 +- src/udev/udev-ctrl.c | 6 +++--- src/udev/udev-watch.c | 6 +++--- src/udev/udevadm-control.c | 6 +++--- src/udev/udevadm-monitor.c | 12 ++++++------ src/udev/udevadm-settle.c | 10 +++++----- src/udev/v4l_id/v4l_id.c | 14 +++++++------- 205 files changed, 334 insertions(+), 352 deletions(-) diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c index b0fa079fec2..a2da976bb61 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -19,12 +19,11 @@ along with systemd; If not, see . ***/ -#include "libudev.h" - #include "alloc-util.h" #include "def.h" #include "escape.h" #include "fileio.h" +#include "libudev.h" #include "mkdir.h" #include "parse-util.h" #include "proc-cmdline.h" diff --git a/src/basic/af-list.c b/src/basic/af-list.c index f396115a34f..07dfff6ad4b 100644 --- a/src/basic/af-list.c +++ b/src/basic/af-list.c @@ -19,16 +19,16 @@ along with systemd; If not, see . ***/ -#include #include +#include -#include "util.h" #include "af-list.h" +#include "util.h" static const struct af_name* lookup_af(register const char *str, register unsigned int len); -#include "af-to-name.h" #include "af-from-name.h" +#include "af-to-name.h" const char *af_to_name(int id) { diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c index 284043cd900..03d8ad74030 100644 --- a/src/basic/arphrd-list.c +++ b/src/basic/arphrd-list.c @@ -22,13 +22,13 @@ #include #include -#include "util.h" #include "arphrd-list.h" +#include "util.h" static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); -#include "arphrd-to-name.h" #include "arphrd-from-name.h" +#include "arphrd-to-name.h" const char *arphrd_to_name(int id) { diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c index 7151fc3d0c6..157ae1fb74b 100644 --- a/src/basic/calendarspec.c +++ b/src/basic/calendarspec.c @@ -23,9 +23,9 @@ #include #include "alloc-util.h" -#include "string-util.h" #include "calendarspec.h" #include "fileio.h" +#include "string-util.h" #define BITS_WEEKDAYS 127 diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c index 4d391510bc8..f0974900cdd 100644 --- a/src/basic/cap-list.c +++ b/src/basic/cap-list.c @@ -28,8 +28,8 @@ static const struct capability_name* lookup_capability(register const char *str, register unsigned int len); -#include "cap-to-name.h" #include "cap-from-name.h" +#include "cap-to-name.h" const char *capability_to_name(int id) { diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c index 34d1331486b..22869e41366 100644 --- a/src/basic/errno-list.c +++ b/src/basic/errno-list.c @@ -21,14 +21,14 @@ #include -#include "util.h" #include "errno-list.h" +#include "util.h" static const struct errno_name* lookup_errno(register const char *str, register unsigned int len); -#include "errno-to-name.h" #include "errno-from-name.h" +#include "errno-to-name.h" const char *errno_to_name(int id) { diff --git a/src/basic/exit-status.c b/src/basic/exit-status.c index fcff753ada3..4c837315405 100644 --- a/src/basic/exit-status.c +++ b/src/basic/exit-status.c @@ -19,12 +19,12 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "exit-status.h" -#include "set.h" #include "macro.h" +#include "set.h" const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) { diff --git a/src/basic/fdset.c b/src/basic/fdset.c index 42b0b2b98f6..fd2e1149f52 100644 --- a/src/basic/fdset.c +++ b/src/basic/fdset.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include "sd-daemon.h" diff --git a/src/basic/fileio-label.c b/src/basic/fileio-label.c index f596f1d11fc..0405822ce08 100644 --- a/src/basic/fileio-label.c +++ b/src/basic/fileio-label.c @@ -20,9 +20,9 @@ along with systemd; If not, see . ***/ -#include "util.h" -#include "selinux-util.h" #include "fileio-label.h" +#include "selinux-util.h" +#include "util.h" int write_string_file_atomic_label(const char *fn, const char *line) { int r; diff --git a/src/basic/json.c b/src/basic/json.c index 716705e5ff5..9d5dedb934c 100644 --- a/src/basic/json.c +++ b/src/basic/json.c @@ -23,9 +23,9 @@ #include #include "alloc-util.h" +#include "hexdecoct.h" #include "json.h" #include "macro.h" -#include "hexdecoct.h" #include "string-util.h" #include "utf8.h" diff --git a/src/basic/label.c b/src/basic/label.c index 82f10b21bd7..f33502f90f2 100644 --- a/src/basic/label.c +++ b/src/basic/label.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ +#include "label.h" #include "selinux-util.h" #include "smack-util.h" #include "util.h" -#include "label.h" int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { int r, q; diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c index 87c3aef7afe..0bdbae480b1 100644 --- a/src/basic/lockfile-util.c +++ b/src/basic/lockfile-util.c @@ -19,12 +19,12 @@ along with systemd; If not, see . ***/ -#include -#include #include -#include -#include #include +#include +#include +#include +#include #include #include "alloc-util.h" diff --git a/src/basic/login-util.c b/src/basic/login-util.c index 832f477bd2b..41cef14e73b 100644 --- a/src/basic/login-util.c +++ b/src/basic/login-util.c @@ -20,8 +20,8 @@ ***/ #include "def.h" -#include "string-util.h" #include "login-util.h" +#include "string-util.h" bool session_id_valid(const char *id) { diff --git a/src/basic/mempool.c b/src/basic/mempool.c index d5d98d88294..9ee6e6a76d6 100644 --- a/src/basic/mempool.c +++ b/src/basic/mempool.c @@ -20,8 +20,8 @@ along with systemd; If not, see . ***/ -#include "mempool.h" #include "macro.h" +#include "mempool.h" #include "util.h" struct pool { diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c index 76bbc1edda1..c241ef6064e 100644 --- a/src/basic/mkdir-label.c +++ b/src/basic/mkdir-label.c @@ -20,8 +20,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "label.h" #include "mkdir.h" diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c index 0214c4627ef..5d7fb9a12d9 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "fs-util.h" #include "mkdir.h" diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c index a821a3d5bb6..e8ce5cfd96d 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -24,15 +24,15 @@ #include #ifdef HAVE_SELINUX -#include -#include #include +#include +#include #endif #include "alloc-util.h" -#include "strv.h" #include "path-util.h" #include "selinux-util.h" +#include "strv.h" #ifdef HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon); diff --git a/src/basic/sigbus.c b/src/basic/sigbus.c index 0108603fe83..c535c89d528 100644 --- a/src/basic/sigbus.c +++ b/src/basic/sigbus.c @@ -23,8 +23,8 @@ #include #include "macro.h" -#include "util.h" #include "sigbus.h" +#include "util.h" #define SIGBUS_QUEUE_MAX 64 diff --git a/src/basic/siphash24.c b/src/basic/siphash24.c index d7640d395de..485e0059cbc 100644 --- a/src/basic/siphash24.c +++ b/src/basic/siphash24.c @@ -17,9 +17,8 @@ coding style) */ -#include "sparse-endian.h" - #include "siphash24.h" +#include "sparse-endian.h" #include "unaligned.h" #include "util.h" diff --git a/src/basic/strv.c b/src/basic/strv.c index ba6df716a71..771781f9fc7 100644 --- a/src/basic/strv.c +++ b/src/basic/strv.c @@ -27,8 +27,8 @@ #include "alloc-util.h" #include "escape.h" #include "string-util.h" -#include "util.h" #include "strv.h" +#include "util.h" char *strv_find(char **l, const char *name) { char **i; diff --git a/src/basic/strxcpyx.c b/src/basic/strxcpyx.c index 6542c0abf54..088ba53c29d 100644 --- a/src/basic/strxcpyx.c +++ b/src/basic/strxcpyx.c @@ -27,6 +27,7 @@ #include #include + #include "strxcpyx.h" size_t strpcpy(char **dest, size_t size, const char *src) { diff --git a/src/basic/user-util.c b/src/basic/user-util.c index d6c936db370..397880b0b1d 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "alloc-util.h" #include "fd-util.h" diff --git a/src/basic/utf8.c b/src/basic/utf8.c index 7600d999032..b4063a4ceca 100644 --- a/src/basic/utf8.c +++ b/src/basic/utf8.c @@ -44,10 +44,10 @@ */ #include -#include #include -#include #include +#include +#include #include "alloc-util.h" #include "hexdecoct.h" diff --git a/src/basic/util.c b/src/basic/util.c index 08bdcd28f25..3e4ec42a28b 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -73,6 +73,7 @@ #include "build.h" #include "def.h" #include "device-nodes.h" +#include "dirent-util.h" #include "env-util.h" #include "escape.h" #include "exit-status.h" @@ -81,19 +82,20 @@ #include "formats-util.h" #include "gunicode.h" #include "hashmap.h" +#include "hexdecoct.h" #include "hostname-util.h" #include "ioprio.h" #include "log.h" #include "macro.h" #include "missing.h" #include "mkdir.h" -#include "hexdecoct.h" #include "parse-util.h" #include "path-util.h" #include "process-util.h" #include "random-util.h" #include "signal-util.h" #include "sparse-endian.h" +#include "stat-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" @@ -102,8 +104,6 @@ #include "utf8.h" #include "util.h" #include "virt.h" -#include "dirent-util.h" -#include "stat-util.h" /* Put this test here for a lack of better place */ assert_cc(EAGAIN == EWOULDBLOCK); diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index 38b79da8866..6d35adc0e2f 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -18,12 +18,12 @@ #include #include -#include "util.h" #include "console.h" -#include "graphics.h" -#include "pefile.h" #include "disk.h" +#include "graphics.h" #include "linux.h" +#include "pefile.h" +#include "util.h" #ifndef EFI_OS_INDICATIONS_BOOT_TO_FW_UI #define EFI_OS_INDICATIONS_BOOT_TO_FW_UI 0x0000000000000001ULL diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c index 66aa88f32ea..2151d344320 100644 --- a/src/boot/efi/console.c +++ b/src/boot/efi/console.c @@ -18,8 +18,8 @@ #include #include -#include "util.h" #include "console.h" +#include "util.h" #define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \ { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } } diff --git a/src/boot/efi/graphics.c b/src/boot/efi/graphics.c index f7324282167..efa91fa7ac2 100644 --- a/src/boot/efi/graphics.c +++ b/src/boot/efi/graphics.c @@ -20,8 +20,8 @@ #include #include -#include "util.h" #include "graphics.h" +#include "util.h" EFI_STATUS graphics_mode(BOOLEAN on) { #define EFI_CONSOLE_CONTROL_PROTOCOL_GUID \ diff --git a/src/boot/efi/linux.c b/src/boot/efi/linux.c index 809c69310e3..e9d097c1329 100644 --- a/src/boot/efi/linux.c +++ b/src/boot/efi/linux.c @@ -17,8 +17,8 @@ #include #include -#include "util.h" #include "linux.h" +#include "util.h" #define SETUP_MAGIC 0x53726448 /* "HdrS" */ struct SetupHeader { diff --git a/src/boot/efi/pefile.c b/src/boot/efi/pefile.c index e6fedbc929f..efb3271ee3c 100644 --- a/src/boot/efi/pefile.c +++ b/src/boot/efi/pefile.c @@ -17,8 +17,8 @@ #include #include -#include "util.h" #include "pefile.h" +#include "util.h" struct DosFileHeader { UINT8 Magic[2]; diff --git a/src/boot/efi/splash.c b/src/boot/efi/splash.c index 470ea3e2cc8..b584b5e6a91 100644 --- a/src/boot/efi/splash.c +++ b/src/boot/efi/splash.c @@ -18,9 +18,9 @@ #include #include -#include "util.h" #include "graphics.h" #include "splash.h" +#include "util.h" struct bmp_file { CHAR8 signature[2]; diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c index 0c5ee4e9ff5..2cd5c33cb6e 100644 --- a/src/boot/efi/stub.c +++ b/src/boot/efi/stub.c @@ -16,12 +16,12 @@ #include #include -#include "util.h" -#include "pefile.h" #include "disk.h" #include "graphics.h" -#include "splash.h" #include "linux.h" +#include "pefile.h" +#include "splash.h" +#include "util.h" /* magic string to find in the binary image */ static const char __attribute__((used)) magic[] = "#### LoaderInfo: systemd-stub " VERSION " ####"; diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c index 05330c05779..2bf473ffc18 100644 --- a/src/bootchart/svg.c +++ b/src/bootchart/svg.c @@ -22,25 +22,25 @@ along with systemd; If not, see . ***/ +#include +#include #include #include +#include #include -#include #include -#include -#include #include "alloc-util.h" #include "architecture.h" -#include "util.h" +#include "bootchart.h" +#include "fd-util.h" #include "fileio.h" +#include "list.h" #include "macro.h" #include "store.h" #include "svg.h" -#include "bootchart.h" -#include "list.h" #include "utf8.h" -#include "fd-util.h" +#include "util.h" #define time_to_graph(t) ((t) * arg_scale_x) #define ps_to_graph(n) ((n) * arg_scale_y) diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c index 6e478842093..2dc5fe631bb 100644 --- a/src/bus-proxyd/stdio-bridge.c +++ b/src/bus-proxyd/stdio-bridge.c @@ -27,8 +27,8 @@ #include #include -#include "sd-daemon.h" #include "sd-bus.h" +#include "sd-daemon.h" #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c index 3ae46d8cfb8..0a484d89fc4 100644 --- a/src/core/audit-fd.c +++ b/src/core/audit-fd.c @@ -21,16 +21,17 @@ #include + #include "audit-fd.h" #ifdef HAVE_AUDIT -#include #include +#include +#include "fd-util.h" #include "log.h" #include "util.h" -#include "fd-util.h" static bool initialized = false; static int audit_fd; diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c index 45f2c2ffd64..54830a515b8 100644 --- a/src/core/dbus-automount.c +++ b/src/core/dbus-automount.c @@ -21,8 +21,8 @@ #include "automount.h" #include "bus-util.h" -#include "string-util.h" #include "dbus-automount.h" +#include "string-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, automount_result, AutomountResult); diff --git a/src/core/dbus-busname.c b/src/core/dbus-busname.c index 05ac89c3c03..445b2376431 100644 --- a/src/core/dbus-busname.c +++ b/src/core/dbus-busname.c @@ -21,9 +21,9 @@ #include "bus-util.h" #include "busname.h" +#include "dbus-busname.h" #include "string-util.h" #include "unit.h" -#include "dbus-busname.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult); diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c index cb156fd37ca..97e4a475560 100644 --- a/src/core/dbus-device.c +++ b/src/core/dbus-device.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include "unit.h" -#include "device.h" #include "dbus-device.h" +#include "device.h" +#include "unit.h" const sd_bus_vtable bus_device_vtable[] = { SD_BUS_VTABLE_START(0), diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c index 3b8116281c0..c633eb1b762 100644 --- a/src/core/dbus-kill.c +++ b/src/core/dbus-kill.c @@ -19,11 +19,10 @@ along with systemd; If not, see . ***/ -#include "signal-util.h" #include "bus-util.h" - -#include "kill.h" #include "dbus-kill.h" +#include "kill.h" +#include "signal-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode); diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c index 90a6d370732..bc5751a10d4 100644 --- a/src/core/dbus-mount.c +++ b/src/core/dbus-mount.c @@ -23,10 +23,10 @@ #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-kill.h" +#include "dbus-mount.h" #include "mount.h" #include "string-util.h" #include "unit.h" -#include "dbus-mount.h" static int property_get_what( sd_bus *bus, diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c index 9e32b5fb06d..e0544e9161d 100644 --- a/src/core/dbus-path.c +++ b/src/core/dbus-path.c @@ -20,10 +20,10 @@ ***/ #include "bus-util.h" +#include "dbus-path.h" #include "path.h" #include "string-util.h" #include "unit.h" -#include "dbus-path.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, path_result, PathResult); diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c index 09e78d1f33b..469e3e1c937 100644 --- a/src/core/dbus-slice.c +++ b/src/core/dbus-slice.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include "unit.h" -#include "slice.h" #include "dbus-cgroup.h" #include "dbus-slice.h" +#include "slice.h" +#include "unit.h" const sd_bus_vtable bus_slice_vtable[] = { SD_BUS_VTABLE_START(0), diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c index 603ca95fd9f..f2a0f1d172a 100644 --- a/src/core/dbus-swap.c +++ b/src/core/dbus-swap.c @@ -23,10 +23,10 @@ #include "bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" +#include "dbus-swap.h" #include "string-util.h" #include "swap.h" #include "unit.h" -#include "dbus-swap.h" static int property_get_priority( sd_bus *bus, diff --git a/src/core/dbus-target.c b/src/core/dbus-target.c index 350f5c3ed22..654bcf1a297 100644 --- a/src/core/dbus-target.c +++ b/src/core/dbus-target.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "unit.h" #include "dbus-target.h" +#include "unit.h" const sd_bus_vtable bus_target_vtable[] = { SD_BUS_VTABLE_START(0), diff --git a/src/core/device.c b/src/core/device.c index bcd4d1146be..5b7130ba97d 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -22,11 +22,10 @@ #include #include -#include "libudev.h" - #include "alloc-util.h" #include "dbus-device.h" #include "device.h" +#include "libudev.h" #include "log.h" #include "parse-util.h" #include "path-util.h" diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c index 3645f9c515e..d92a9a764f6 100644 --- a/src/core/hostname-setup.c +++ b/src/core/hostname-setup.c @@ -25,12 +25,12 @@ #include "alloc-util.h" #include "fileio.h" +#include "hostname-setup.h" #include "hostname-util.h" #include "log.h" #include "macro.h" #include "string-util.h" #include "util.h" -#include "hostname-setup.h" int hostname_setup(void) { int r; diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c index 9572fa17d9c..4f42ae6f31b 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -21,8 +21,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "fd-util.h" #include "fileio.h" diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 651f79a1fe5..a6ab8cf4b38 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -19,17 +19,17 @@ along with systemd; If not, see . ***/ -#include #include +#include #ifdef HAVE_KMOD #include #endif -#include "macro.h" -#include "capability-util.h" #include "bus-util.h" +#include "capability-util.h" #include "kmod-setup.h" +#include "macro.h" #ifdef HAVE_KMOD static void systemd_kmod_log( diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c index 11566af51b6..3fa66f91aad 100644 --- a/src/core/load-dropin.c +++ b/src/core/load-dropin.c @@ -20,13 +20,13 @@ ***/ -#include "unit.h" +#include "conf-parser.h" #include "load-dropin.h" +#include "load-fragment.h" #include "log.h" #include "strv.h" #include "unit-name.h" -#include "conf-parser.h" -#include "load-fragment.h" +#include "unit.h" static int add_dependency_consumer( UnitDependency dependency, diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 5d013de2e84..dda79267f70 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -32,8 +32,8 @@ #include #include -#include "alloc-util.h" #include "af-list.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-internal.h" #include "bus-util.h" diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index bd632131b90..4c8d920389f 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c @@ -24,12 +24,12 @@ #include "env-util.h" #include "fileio.h" +#include "locale-setup.h" #include "locale-util.h" #include "string-util.h" #include "strv.h" #include "util.h" #include "virt.h" -#include "locale-setup.h" int locale_setup(char ***environment) { char **add; diff --git a/src/core/main.c b/src/core/main.c index a09ce0f0836..97f904b0316 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -37,8 +37,8 @@ #include #endif -#include "sd-daemon.h" #include "sd-bus.h" +#include "sd-daemon.h" #include "alloc-util.h" #include "architecture.h" diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index b2596d1cd19..2b8d590ed1f 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ -#include #include +#include #include +#include #include -#include #include "alloc-util.h" #include "bus-util.h" diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c index 4bcdd273899..8856927c88f 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -23,10 +23,10 @@ #ifdef HAVE_SELINUX -#include #include -#include #include +#include +#include #ifdef HAVE_AUDIT #include #endif diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c index d9b00fb95c4..d4757e08530 100644 --- a/src/core/selinux-setup.c +++ b/src/core/selinux-setup.c @@ -29,10 +29,10 @@ #include "log.h" #include "macro.h" +#include "selinux-setup.h" #include "selinux-util.h" #include "string-util.h" #include "util.h" -#include "selinux-setup.h" #ifdef HAVE_SELINUX _printf_(2,3) diff --git a/src/core/slice.c b/src/core/slice.c index 9c488f0fd78..06ac6f84502 100644 --- a/src/core/slice.c +++ b/src/core/slice.c @@ -24,12 +24,12 @@ #include "alloc-util.h" #include "dbus-slice.h" #include "log.h" +#include "slice.h" #include "special.h" #include "string-util.h" #include "strv.h" #include "unit-name.h" #include "unit.h" -#include "slice.h" static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = { [SLICE_DEAD] = UNIT_INACTIVE, diff --git a/src/core/swap.c b/src/core/swap.c index ee0838e6762..f9e1ebad49c 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -24,8 +24,6 @@ #include #include -#include "libudev.h" - #include "alloc-util.h" #include "dbus-swap.h" #include "escape.h" @@ -33,6 +31,7 @@ #include "fd-util.h" #include "formats-util.h" #include "fstab-util.h" +#include "libudev.h" #include "parse-util.h" #include "path-util.h" #include "process-util.h" diff --git a/src/core/transaction.c b/src/core/transaction.c index cf37b5eb750..15e79d00b30 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/core/umount.c b/src/core/umount.c index 9d1f7660db7..954e50528d3 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -27,12 +27,11 @@ #include #include -#include "libudev.h" - #include "alloc-util.h" #include "escape.h" #include "fd-util.h" #include "fstab-util.h" +#include "libudev.h" #include "list.h" #include "mount-setup.h" #include "path-util.h" diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 5b806a1e691..e0436d794ce 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -20,14 +20,14 @@ along with systemd; If not, see . ***/ -#include -#include #include -#include #include +#include +#include #include -#include #include +#include +#include #include "sd-bus.h" #include "sd-device.h" diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 34852ce3818..c32bf1c9d64 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -19,12 +19,11 @@ along with systemd; If not, see . ***/ -#include +#include #include #include -#include +#include -#include "libudev.h" #include "sd-id128.h" #include "alloc-util.h" @@ -37,6 +36,7 @@ #include "fstab-util.h" #include "generator.h" #include "gpt.h" +#include "libudev.h" #include "missing.h" #include "mkdir.h" #include "mount-util.h" diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c index 316a2803d31..2e1259ef683 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include "alloc-util.h" diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 92061532b8e..dde2baf6617 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -21,8 +21,8 @@ #include #include -#include #include +#include #include "alloc-util.h" #include "bus-util.h" diff --git a/src/import/aufs-util.c b/src/import/aufs-util.c index 7b1ac134a0d..82f519958cc 100644 --- a/src/import/aufs-util.c +++ b/src/import/aufs-util.c @@ -21,10 +21,10 @@ #include +#include "aufs-util.h" #include "rm-rf.h" #include "string-util.h" #include "util.h" -#include "aufs-util.h" static int nftw_cb( const char *fpath, diff --git a/src/import/export-raw.c b/src/import/export-raw.c index 103d45bf218..28c87594d68 100644 --- a/src/import/export-raw.c +++ b/src/import/export-raw.c @@ -20,6 +20,10 @@ ***/ #include + +/* When we include libgen.h because we need dirname() we immediately + * undefine basename() since libgen.h defines it as a macro to the POSIX + * version which is really broken. We prefer GNU basename(). */ #include #undef basename diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index e7fcd293f17..2e48167c544 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "sd-daemon.h" diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index d4f8673187c..a35f2b541cc 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ -#include +#include #include -#include +#include #include -#include +#include #include "sd-bus.h" #include "sd-daemon.h" diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c index 3ee6d32bf72..a6d7c3b7e8c 100644 --- a/src/journal-remote/journal-upload-journal.c +++ b/src/journal-remote/journal-upload-journal.c @@ -19,9 +19,8 @@ along with systemd; If not, see . ***/ -#include - #include +#include #include "alloc-util.h" #include "journal-upload.h" diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c index b2c398a845b..09e6da0031d 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -32,10 +32,10 @@ #include "alloc-util.h" #include "log.h" #include "macro.h" +#include "microhttpd-util.h" #include "string-util.h" #include "strv.h" #include "util.h" -#include "microhttpd-util.h" void microhttpd_logger(void *arg, const char *fmt, va_list ap) { char *f; diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c index 4888c7d05dc..086bf7e7e3e 100644 --- a/src/journal/audit-type.c +++ b/src/journal/audit-type.c @@ -25,8 +25,7 @@ # include #endif -#include "audit-type.h" -#include "macro.h" #include "missing.h" - +#include "audit-type.h" #include "audit_type-to-name.h" +#include "macro.h" diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c index 0c4ac5cdc38..aeec83da1ed 100644 --- a/src/journal/journal-authenticate.c +++ b/src/journal/journal-authenticate.c @@ -24,10 +24,10 @@ #include "fd-util.h" #include "fsprg.h" +#include "hexdecoct.h" #include "journal-authenticate.h" #include "journal-def.h" #include "journal-file.h" -#include "hexdecoct.h" static uint64_t journal_file_tag_seqnum(JournalFile *f) { uint64_t r; diff --git a/src/journal/journal-qrcode.c b/src/journal/journal-qrcode.c index 1db66e89c64..257ddb302b7 100644 --- a/src/journal/journal-qrcode.c +++ b/src/journal/journal-qrcode.c @@ -20,12 +20,11 @@ ***/ #include -#include #include -#include -#include - #include +#include +#include +#include #include "journal-qrcode.h" diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c index 3676cb87887..715847e0184 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include -#include #include #include +#include +#include #include "alloc-util.h" #include "compress.h" diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c index 89f3d4b42f1..04487c29b5a 100644 --- a/src/journal/journald-console.c +++ b/src/journal/journald-console.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include #include #include +#include #include "alloc-util.h" #include "fd-util.h" diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c index e048e04716b..9a8d1e026ba 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c @@ -25,7 +25,6 @@ #include #include -#include "libudev.h" #include "sd-messages.h" #include "escape.h" @@ -35,6 +34,7 @@ #include "journald-kmsg.h" #include "journald-server.h" #include "journald-syslog.h" +#include "libudev.h" #include "parse-util.h" #include "process-util.h" #include "stdio-util.h" diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c index ad78d092944..65e2c3e5702 100644 --- a/src/journal/journald-rate-limit.c +++ b/src/journal/journald-rate-limit.c @@ -24,11 +24,11 @@ #include "alloc-util.h" #include "hashmap.h" +#include "journald-rate-limit.h" #include "list.h" #include "random-util.h" #include "string-util.h" #include "util.h" -#include "journald-rate-limit.h" #define POOLS_MAX 5 #define BUCKETS_MAX 127 diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index be913d26ef4..b532616db6f 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -28,7 +28,6 @@ #include #include -#include "libudev.h" #include "sd-daemon.h" #include "sd-journal.h" #include "sd-messages.h" @@ -58,6 +57,7 @@ #include "journald-server.h" #include "journald-stream.h" #include "journald-syslog.h" +#include "libudev.h" #include "missing.h" #include "mkdir.h" #include "parse-util.h" diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c index 69540f11416..88bea3b86e0 100644 --- a/src/journal/journald-wall.c +++ b/src/journal/journald-wall.c @@ -22,10 +22,10 @@ #include "alloc-util.h" #include "formats-util.h" #include "journald-server.h" +#include "journald-wall.h" #include "process-util.h" #include "string-util.h" #include "utmp-wtmp.h" -#include "journald-wall.h" void server_forward_wall( Server *s, diff --git a/src/journal/journald.c b/src/journal/journald.c index b137e3c7bea..b9f5c099e1c 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -21,16 +21,15 @@ #include -#include "sd-messages.h" #include "sd-daemon.h" +#include "sd-messages.h" +#include "formats-util.h" #include "journal-authenticate.h" -#include "journald-server.h" #include "journald-kmsg.h" +#include "journald-server.h" #include "journald-syslog.h" - #include "sigbus.h" -#include "formats-util.h" int main(int argc, char *argv[]) { Server server; diff --git a/src/journal/lookup3.c b/src/journal/lookup3.c index 52ffdf7b1d8..3d791234f43 100644 --- a/src/journal/lookup3.c +++ b/src/journal/lookup3.c @@ -40,10 +40,10 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy. */ /* #define SELF_TEST 1 */ -#include /* defines printf for tests */ -#include /* defines time_t for timings in the test */ #include /* defines uint32_t etc */ +#include /* defines printf for tests */ #include /* attempt to define endianness */ +#include /* defines time_t for timings in the test */ #ifdef linux # include /* attempt to define endianness */ #endif diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c index 3cb1dfa986a..95402578957 100644 --- a/src/journal/mmap-cache.c +++ b/src/journal/mmap-cache.c @@ -27,10 +27,10 @@ #include "hashmap.h" #include "list.h" #include "log.h" -#include "util.h" #include "macro.h" -#include "sigbus.h" #include "mmap-cache.h" +#include "sigbus.h" +#include "util.h" typedef struct Window Window; typedef struct Context Context; diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c index aea8fd15e6a..25980b7744e 100644 --- a/src/journal/test-catalog.c +++ b/src/journal/test-catalog.c @@ -20,10 +20,10 @@ along with systemd; If not, see . ***/ -#include -#include #include #include +#include +#include #include "sd-messages.h" diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c index 040c7d58fb5..8f56ea19072 100644 --- a/src/journal/test-journal-enum.c +++ b/src/journal/test-journal-enum.c @@ -23,9 +23,9 @@ #include "sd-journal.h" +#include "journal-internal.h" #include "log.h" #include "macro.h" -#include "journal-internal.h" int main(int argc, char *argv[]) { unsigned n = 0; diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index 4ad89fe4b6a..5c055ef748a 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -20,8 +20,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "sd-journal.h" diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c index 887a83efe1d..a7abb11fba8 100644 --- a/src/journal/test-journal-verify.c +++ b/src/journal/test-journal-verify.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ +#include #include #include -#include #include "fd-util.h" #include "journal-file.h" diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c index 01d4bc968a2..266e0d54738 100644 --- a/src/journal/test-journal.c +++ b/src/journal/test-journal.c @@ -22,11 +22,11 @@ #include #include -#include "log.h" -#include "rm-rf.h" -#include "journal-file.h" #include "journal-authenticate.h" +#include "journal-file.h" #include "journal-vacuum.h" +#include "log.h" +#include "rm-rf.h" static bool arg_keep = false; diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index 368525c40ac..f8e6cb6ea98 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ -#include "libudev.h" #include "sd-id128.h" #include "dhcp-identifier.h" #include "dhcp6-protocol.h" +#include "libudev.h" #include "network-internal.h" #include "siphash24.h" #include "sparse-endian.h" diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c index 36be7d54ed2..a6c410ba911 100644 --- a/src/libsystemd-network/dhcp-option.c +++ b/src/libsystemd-network/dhcp-option.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include -#include #include +#include #include +#include #include "dhcp-internal.h" diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c index cd7f5095ca9..9ff42b155eb 100644 --- a/src/libsystemd-network/dhcp-packet.c +++ b/src/libsystemd-network/dhcp-packet.c @@ -19,13 +19,12 @@ ***/ #include -#include #include #include +#include - -#include "dhcp-protocol.h" #include "dhcp-internal.h" +#include "dhcp-protocol.h" #define DHCP_CLIENT_MIN_OPTIONS_SIZE 312 diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c index 0f46df6a1b9..62023a9e490 100644 --- a/src/libsystemd-network/dhcp6-option.c +++ b/src/libsystemd-network/dhcp6-option.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include "alloc-util.h" diff --git a/src/libsystemd-network/lldp-port.c b/src/libsystemd-network/lldp-port.c index 97b6b485d26..1f1a49adbf8 100644 --- a/src/libsystemd-network/lldp-port.c +++ b/src/libsystemd-network/lldp-port.c @@ -22,9 +22,9 @@ #include "alloc-util.h" #include "async.h" -#include "lldp-port.h" -#include "lldp-network.h" #include "lldp-internal.h" +#include "lldp-network.h" +#include "lldp-port.h" int lldp_port_start(lldp_port *p) { int r; diff --git a/src/libsystemd-network/lldp-tlv.c b/src/libsystemd-network/lldp-tlv.c index 78901604977..66343147a1c 100644 --- a/src/libsystemd-network/lldp-tlv.c +++ b/src/libsystemd-network/lldp-tlv.c @@ -20,8 +20,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "alloc-util.h" #include "lldp-tlv.h" diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index ab20b6065a3..49a755c0486 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -29,9 +29,9 @@ #include "condition.h" #include "conf-parser.h" #include "dhcp-lease-internal.h" +#include "hexdecoct.h" #include "log.h" #include "network-internal.h" -#include "hexdecoct.h" #include "parse-util.h" #include "siphash24.h" #include "string-util.h" diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c index 94c31af3f3d..69eff5116f5 100644 --- a/src/libsystemd-network/test-acd.c +++ b/src/libsystemd-network/test-acd.c @@ -19,21 +19,21 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include #include #include "sd-event.h" -#include "sd-netlink.h" #include "sd-ipv4acd.h" +#include "sd-netlink.h" -#include "util.h" #include "event-util.h" -#include "netlink-util.h" #include "in-addr-util.h" +#include "netlink-util.h" +#include "util.h" static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) { assert_se(acd); diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index 5b52c1cbb9b..1200a7c251a 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -32,8 +32,8 @@ #include "dhcp-internal.h" #include "dhcp-protocol.h" #include "event-util.h" -#include "util.h" #include "fd-util.h" +#include "util.h" static uint8_t mac_addr[] = {'A', 'B', 'C', '1', '2', '3'}; diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c index 2d29e28f168..3607df63af9 100644 --- a/src/libsystemd-network/test-dhcp-option.c +++ b/src/libsystemd-network/test-dhcp-option.c @@ -1,8 +1,8 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#include -#include #include +#include +#include #include #include "alloc-util.h" diff --git a/src/libsystemd/sd-bus/bus-bloom.c b/src/libsystemd/sd-bus/bus-bloom.c index a592ff50cfd..43668e37ee9 100644 --- a/src/libsystemd/sd-bus/bus-bloom.c +++ b/src/libsystemd/sd-bus/bus-bloom.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include "util.h" -#include "siphash24.h" #include "bus-bloom.h" +#include "siphash24.h" +#include "util.h" static inline void set_bit(uint64_t filter[], unsigned long b) { filter[b >> 6] |= 1ULL << (b & 63); diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c index 52f8dfd3beb..8d486fcbbdd 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.c +++ b/src/libsystemd/sd-bus/bus-common-errors.c @@ -22,8 +22,9 @@ #include #include "sd-bus.h" -#include "bus-error.h" + #include "bus-common-errors.h" +#include "bus-error.h" BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = { SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_UNIT, ENOENT), diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c index 589a90bbfff..7da6ba99038 100644 --- a/src/libsystemd/sd-bus/bus-container.c +++ b/src/libsystemd/sd-bus/bus-container.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "bus-container.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index ddd3a55b6c9..94251fe87c0 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -23,8 +23,8 @@ #include #endif -#include #include +#include #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 239d7245e6e..404eaa3c895 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -29,10 +29,10 @@ #include "sd-bus.h" #include "alloc-util.h" +#include "bus-error.h" #include "errno-list.h" #include "string-util.h" #include "util.h" -#include "bus-error.h" BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed", EACCES), diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c index 402d43d66d7..ec027590b20 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.c +++ b/src/libsystemd/sd-bus/bus-gvariant.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include "bus-type.h" #include "bus-gvariant.h" #include "bus-signature.h" +#include "bus-type.h" int bus_gvariant_get_size(const char *signature) { const char *p; diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index 8c472626a86..303e49fa847 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -23,6 +23,7 @@ #include "bus-internal.h" #include "bus-introspect.h" #include "bus-message.h" +#include "bus-objects.h" #include "bus-signature.h" #include "bus-slot.h" #include "bus-type.h" @@ -30,7 +31,6 @@ #include "set.h" #include "string-util.h" #include "strv.h" -#include "bus-objects.h" static int node_vtable_get_userdata( sd_bus *bus, diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c index 550bad27ba6..e405a04c53d 100644 --- a/src/libsystemd/sd-bus/bus-slot.c +++ b/src/libsystemd/sd-bus/bus-slot.c @@ -24,8 +24,8 @@ #include "alloc-util.h" #include "bus-control.h" #include "bus-objects.h" -#include "string-util.h" #include "bus-slot.h" +#include "string-util.h" sd_bus_slot *bus_slot_allocate( sd_bus *bus, diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index a8d79b01b04..99780c8cceb 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -20,12 +20,12 @@ ***/ #include -#include -#include #include #include -#include #include +#include +#include +#include #include "sd-bus.h" @@ -46,10 +46,10 @@ #include "cgroup-util.h" #include "def.h" #include "fd-util.h" +#include "hexdecoct.h" #include "hostname-util.h" #include "macro.h" #include "missing.h" -#include "hexdecoct.h" #include "parse-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index 767aef63ffe..f20eced4ac4 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include +#include #include +#include #include -#include #include "sd-bus.h" @@ -31,11 +31,11 @@ #include "bus-internal.h" #include "bus-match.h" #include "bus-util.h" +#include "fd-util.h" #include "formats-util.h" #include "log.h" #include "macro.h" #include "util.h" -#include "fd-util.h" static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m))); diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c index 580117165a1..bd0101af9e2 100644 --- a/src/libsystemd/sd-bus/test-bus-creds.c +++ b/src/libsystemd/sd-bus/test-bus-creds.c @@ -20,6 +20,7 @@ ***/ #include "sd-bus.h" + #include "bus-dump.h" #include "bus-util.h" #include "cgroup-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c index 5753c04b0e8..9d6c221eb0a 100644 --- a/src/libsystemd/sd-bus/test-bus-error.c +++ b/src/libsystemd/sd-bus/test-bus-error.c @@ -20,10 +20,11 @@ ***/ #include "sd-bus.h" + +#include "bus-common-errors.h" #include "bus-error.h" #include "bus-util.h" #include "errno-list.h" -#include "bus-common-errors.h" static void test_error(void) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL; diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c index f39dedeb24a..26ba16d119a 100644 --- a/src/libsystemd/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/sd-bus/test-bus-introspect.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "log.h" #include "bus-introspect.h" +#include "log.h" static int prop_get(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error) { return -EINVAL; diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c index 0747d6a37cb..0a6093e78be 100644 --- a/src/libsystemd/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/sd-bus/test-bus-marshal.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #ifdef HAVE_GLIB #include @@ -38,8 +38,8 @@ #include "bus-message.h" #include "bus-util.h" #include "fd-util.h" -#include "log.h" #include "hexdecoct.h" +#include "log.h" #include "util.h" static void test_bus_path_encode_unique(void) { diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c index 75ea28371bf..94896c196a3 100644 --- a/src/libsystemd/sd-bus/test-bus-match.c +++ b/src/libsystemd/sd-bus/test-bus-match.c @@ -19,13 +19,12 @@ along with systemd; If not, see . ***/ -#include "log.h" -#include "macro.h" - #include "bus-match.h" #include "bus-message.h" -#include "bus-util.h" #include "bus-slot.h" +#include "bus-util.h" +#include "log.h" +#include "macro.h" static bool mask[32]; diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c index 5bc72e2355d..edd63f9ea73 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/sd-bus/test-bus-objects.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c index 92a810a7d8d..949d16e6e97 100644 --- a/src/libsystemd/sd-bus/test-bus-signature.c +++ b/src/libsystemd/sd-bus/test-bus-signature.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include "string-util.h" -#include "log.h" -#include "bus-signature.h" #include "bus-internal.h" +#include "bus-signature.h" +#include "log.h" +#include "string-util.h" int main(int argc, char *argv[]) { char prefix[256]; diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c index ff8df61a9e6..1cf8416fa4f 100644 --- a/src/libsystemd/sd-bus/test-bus-zero-copy.c +++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c @@ -27,11 +27,11 @@ #include "bus-dump.h" #include "bus-kernel.h" #include "bus-message.h" +#include "fd-util.h" #include "log.h" #include "memfd-util.h" #include "string-util.h" #include "util.h" -#include "fd-util.h" #define FIRST_ARRAY 17 #define SECOND_ARRAY 33 diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c index 1e17ea6a063..c12bb1e20be 100644 --- a/src/libsystemd/sd-id128/sd-id128.c +++ b/src/libsystemd/sd-id128/sd-id128.c @@ -26,9 +26,9 @@ #include "sd-id128.h" #include "fd-util.h" +#include "hexdecoct.h" #include "io-util.h" #include "macro.h" -#include "hexdecoct.h" #include "random-util.h" #include "util.h" diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/libsystemd/sd-netlink/local-addresses.c index a00865b56bd..d431ba4be4d 100644 --- a/src/libsystemd/sd-netlink/local-addresses.c +++ b/src/libsystemd/sd-netlink/local-addresses.c @@ -23,9 +23,9 @@ #include "sd-netlink.h" #include "alloc-util.h" -#include "netlink-util.h" -#include "macro.h" #include "local-addresses.h" +#include "macro.h" +#include "netlink-util.h" static int address_compare(const void *_a, const void *_b) { const struct local_address *a = _a, *b = _b; diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/sd-netlink/netlink-util.c index 6f9fd2993b1..95690b7ff12 100644 --- a/src/libsystemd/sd-netlink/netlink-util.c +++ b/src/libsystemd/sd-netlink/netlink-util.c @@ -21,8 +21,8 @@ #include "sd-netlink.h" -#include "netlink-util.h" #include "netlink-internal.h" +#include "netlink-util.h" int rtnl_set_link_name(sd_netlink **rtnl, int ifindex, const char *name) { _cleanup_netlink_message_unref_ sd_netlink_message *message = NULL; diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/libsystemd/sd-netlink/test-local-addresses.c index 71801759700..0b53297ab80 100644 --- a/src/libsystemd/sd-netlink/test-local-addresses.c +++ b/src/libsystemd/sd-netlink/test-local-addresses.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ +#include "af-list.h" #include "alloc-util.h" #include "in-addr-util.h" #include "local-addresses.h" -#include "af-list.h" static void print_local_addresses(struct local_address *a, unsigned n) { unsigned i; diff --git a/src/libsystemd/sd-utf8/sd-utf8.c b/src/libsystemd/sd-utf8/sd-utf8.c index 381397cc520..9e52db3b3dd 100644 --- a/src/libsystemd/sd-utf8/sd-utf8.c +++ b/src/libsystemd/sd-utf8/sd-utf8.c @@ -21,8 +21,8 @@ #include "sd-utf8.h" -#include "util.h" #include "utf8.h" +#include "util.h" _public_ const char *sd_utf8_is_valid(const char *s) { assert_return(s, NULL); diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c index 2d3e62410c5..fa4e3a2b1e7 100644 --- a/src/libudev/libudev-device-private.c +++ b/src/libudev/libudev-device-private.c @@ -18,11 +18,10 @@ along with systemd; If not, see . ***/ -#include "libudev.h" - #include "device-private.h" #include "libudev-device-internal.h" #include "libudev-private.h" +#include "libudev.h" int udev_device_tag_index(struct udev_device *udev_device, struct udev_device *udev_device_old, bool add) { sd_device *device_old = NULL; diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index 814e016800c..b17ecd870d6 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -34,7 +34,6 @@ #include #include -#include "libudev.h" #include "sd-device.h" #include "alloc-util.h" @@ -42,6 +41,7 @@ #include "device-util.h" #include "libudev-device-internal.h" #include "libudev-private.h" +#include "libudev.h" #include "parse-util.h" /** diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c index 442f9615f2d..f15b099ad1c 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/libudev-enumerate.c @@ -28,13 +28,13 @@ #include #include -#include "libudev.h" #include "sd-device.h" #include "alloc-util.h" #include "device-enumerator-private.h" #include "device-util.h" #include "libudev-device-internal.h" +#include "libudev.h" /** * SECTION:libudev-enumerate diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index f870eba9eb2..f1ef4ac96fb 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -28,13 +28,12 @@ #include #include -#include "libudev.h" - #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" #include "libudev-private.h" +#include "libudev.h" #include "missing.h" #include "mount-util.h" #include "socket-util.h" diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c index 58410b1b8fe..e3dffa6925f 100644 --- a/src/libudev/libudev-queue.c +++ b/src/libudev/libudev-queue.c @@ -18,11 +18,11 @@ along with systemd; If not, see . ***/ -#include -#include -#include #include +#include +#include #include +#include #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c index 574cfeac856..4a75980b1fd 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-util.c @@ -24,11 +24,10 @@ #include #include -#include "libudev.h" - #include "MurmurHash2.h" #include "device-nodes.h" #include "libudev-private.h" +#include "libudev.h" #include "syslog-util.h" #include "utf8.h" diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index 63fb05547de..3f76dd81713 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -24,11 +24,10 @@ #include #include -#include "libudev.h" - #include "alloc-util.h" #include "fd-util.h" #include "libudev-private.h" +#include "libudev.h" #include "missing.h" #include "string-util.h" diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 38c426c1aae..36cdbbe0f92 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include -#include #include #include +#include +#include #include #include "alloc-util.h" diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index 9bf3ca09955..0c6983d73ae 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -25,11 +25,10 @@ #include #include -#include "libudev.h" - #include "alloc-util.h" #include "bus-util.h" #include "fd-util.h" +#include "libudev.h" #include "logind-session-device.h" #include "missing.h" #include "util.h" diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 6c4ada29fbe..9f03a7b31e3 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -36,7 +36,6 @@ #include "bus-util.h" #include "escape.h" #include "fd-util.h" -#include "fd-util.h" #include "fileio.h" #include "formats-util.h" #include "io-util.h" diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index 3e7a935a34a..3bd61a81fd5 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -20,9 +20,9 @@ ***/ #include +#include #include #include -#include #include "sd-messages.h" diff --git a/src/login/logind.c b/src/login/logind.c index 7b41174c64b..04f467ceb4d 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -24,7 +24,6 @@ #include #include -#include "libudev.h" #include "sd-daemon.h" #include "alloc-util.h" @@ -35,6 +34,7 @@ #include "dirent-util.h" #include "fd-util.h" #include "formats-util.h" +#include "libudev.h" #include "logind.h" #include "signal-util.h" #include "strv.h" diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index e9ca4bb03d0..86acee5751d 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -22,9 +22,8 @@ #include #include -#include "libudev.h" - #include "alloc-util.h" +#include "libudev.h" #include "locale-util.h" #include "path-util.h" #include "string-util.h" diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c index 4c4275d1245..ac327f71fb2 100644 --- a/src/login/test-login-shared.c +++ b/src/login/test-login-shared.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "macro.h" #include "login-util.h" +#include "macro.h" static void test_session_id_valid(void) { assert_se(session_id_valid("c1")); diff --git a/src/login/test-login-tables.c b/src/login/test-login-tables.c index a4196bf14b3..4fbc893a9a0 100644 --- a/src/login/test-login-tables.c +++ b/src/login/test-login-tables.c @@ -19,7 +19,6 @@ #include "logind-action.h" #include "logind-session.h" - #include "test-tables.h" int main(int argc, char **argv) { diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index f1165ea09ca..d805bcfdca7 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -26,8 +26,8 @@ #include "log.h" #include "machine-id-setup.h" -#include "util.h" #include "path-util.h" +#include "util.h" static char *arg_root = NULL; static bool arg_commit = false; diff --git a/src/machine/machine.c b/src/machine/machine.c index 196bc4b8f4f..282079f228e 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -29,6 +29,7 @@ #include "bus-error.h" #include "bus-util.h" #include "escape.h" +#include "extract-word.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" @@ -42,7 +43,6 @@ #include "terminal-util.h" #include "unit-name.h" #include "util.h" -#include "extract-word.h" Machine* machine_new(Manager *manager, MachineClass class, const char *name) { Machine *m; diff --git a/src/machine/test-machine-tables.c b/src/machine/test-machine-tables.c index 4aae426050d..f851a4d37d8 100644 --- a/src/machine/test-machine-tables.c +++ b/src/machine/test-machine-tables.c @@ -18,7 +18,6 @@ ***/ #include "machine.h" - #include "test-tables.h" int main(int argc, char **argv) { diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 446b048ef1b..6fcb3050c77 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -36,7 +36,6 @@ #include "lldp.h" #include "local-addresses.h" #include "locale-util.h" -#include "locale-util.h" #include "netlink-util.h" #include "pager.h" #include "parse-util.h" diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index c9222b8cb8e..6e5480ee220 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "alloc-util.h" #include "conf-parser.h" diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index 506654b5d7c..f4aac4bb932 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -22,8 +22,8 @@ #include #include -#include "networkd-link.h" #include "network-internal.h" +#include "networkd-link.h" static int ipv4ll_address_lost(Link *link) { _cleanup_address_free_ Address *address = NULL; diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c index 11b35d6cf80..d09a3c2d07d 100644 --- a/src/network/networkd-link-bus.c +++ b/src/network/networkd-link-bus.c @@ -19,13 +19,12 @@ along with systemd; If not, see . ***/ -#include "bus-util.h" -#include "strv.h" - #include "alloc-util.h" +#include "bus-util.h" #include "networkd-link.h" #include "networkd.h" #include "parse-util.h" +#include "strv.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_administrative_state, link_state, LinkState); diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c index 4e4755f86f9..50b9021d095 100644 --- a/src/network/networkd-netdev-bond.c +++ b/src/network/networkd-netdev-bond.c @@ -29,8 +29,8 @@ #include "conf-parser.h" #include "missing.h" #include "networkd-netdev-bond.h" -#include "string-util.h" #include "string-table.h" +#include "string-util.h" /* * Number of seconds between instances where the bonding diff --git a/src/network/networkd-netdev-bridge.c b/src/network/networkd-netdev-bridge.c index 57c58d83b4c..a991bdb5fba 100644 --- a/src/network/networkd-netdev-bridge.c +++ b/src/network/networkd-netdev-bridge.c @@ -22,9 +22,9 @@ #include -#include "networkd-netdev-bridge.h" #include "missing.h" #include "netlink-util.h" +#include "networkd-netdev-bridge.h" /* callback for brige netdev's parameter set */ static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) { diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/networkd-netdev-tuntap.c index 851e83537e7..3d504a85644 100644 --- a/src/network/networkd-netdev-tuntap.c +++ b/src/network/networkd-netdev-tuntap.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include "alloc-util.h" diff --git a/src/network/networkd-netdev-veth.c b/src/network/networkd-netdev-veth.c index bee1a167263..773a1ee6d18 100644 --- a/src/network/networkd-netdev-veth.c +++ b/src/network/networkd-netdev-veth.c @@ -23,6 +23,7 @@ #include #include "sd-netlink.h" + #include "networkd-netdev-veth.h" static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { diff --git a/src/network/networkd-netdev-vxlan.c b/src/network/networkd-netdev-vxlan.c index 755ad2f9347..7932b93335f 100644 --- a/src/network/networkd-netdev-vxlan.c +++ b/src/network/networkd-netdev-vxlan.c @@ -22,10 +22,11 @@ #include #include "sd-netlink.h" -#include "networkd-netdev-vxlan.h" -#include "networkd-link.h" + #include "conf-parser.h" #include "missing.h" +#include "networkd-link.h" +#include "networkd-netdev-vxlan.h" static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { VxLan *v; diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index 438214015d8..ecbbe6c3c9f 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -1,11 +1,10 @@ -#include "networkd.h" -#include "networkd-netdev-bond.h" -#include "networkd-netdev-macvlan.h" #include "dhcp6-internal.h" #include "dhcp6-protocol.h" -#include "netlink-internal.h" #include "ethtool-util.h" - +#include "netlink-internal.h" +#include "networkd-netdev-bond.h" +#include "networkd-netdev-macvlan.h" +#include "networkd.h" #include "test-tables.h" int main(int argc, char **argv) { diff --git a/src/network/test-network.c b/src/network/test-network.c index dbed3795e3f..a1a77b68677 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -20,9 +20,9 @@ ***/ #include "alloc-util.h" -#include "networkd.h" -#include "network-internal.h" #include "dhcp-lease-internal.h" +#include "network-internal.h" +#include "networkd.h" static void test_deserialize_in_addr(void) { _cleanup_free_ struct in_addr *addresses = NULL; diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index 92dfb945e00..04d8da3bc8a 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -22,18 +22,18 @@ #include #include -#include "libudev.h" #include "sd-id128.h" #include "sd-netlink.h" #include "alloc-util.h" #include "ether-addr-util.h" +#include "libudev.h" #include "netlink-util.h" +#include "nspawn-network.h" #include "siphash24.h" #include "string-util.h" #include "udev-util.h" #include "util.h" -#include "nspawn-network.h" #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1) #define CONTAINER_HASH_KEY SD_ID128_MAKE(c3,c4,f9,19,b5,57,b2,1c,e6,cf,14,27,03,9c,ee,a2) diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c index dc2911e4e8b..883d96608d4 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.c @@ -25,11 +25,11 @@ #include #include +#include "proc-cmdline.h" #include "process-util.h" #include "signal-util.h" #include "string-util.h" #include "util.h" -#include "proc-cmdline.h" static bool arg_skip = false; static bool arg_force = false; diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c index 57f99c9ef0c..b155f991bb6 100644 --- a/src/remount-fs/remount-fs.c +++ b/src/remount-fs/remount-fs.c @@ -19,12 +19,12 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include #include -#include +#include #include "exit-status.h" #include "log.h" diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c index 432e62dd9f8..eb4e646846b 100644 --- a/src/resolve-host/resolve-host.c +++ b/src/resolve-host/resolve-host.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "sd-bus.h" diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c index 5c3a4a00c30..6a7ff9d2458 100644 --- a/src/resolve/resolved-llmnr.c +++ b/src/resolve/resolved-llmnr.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "fd-util.h" #include "resolved-llmnr.h" diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index 5c45a3ae6c5..45a41ccd336 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -22,7 +22,6 @@ #include #include -#include "libudev.h" #include "sd-daemon.h" #include "alloc-util.h" @@ -30,6 +29,7 @@ #include "fd-util.h" #include "fileio.h" #include "io-util.h" +#include "libudev.h" #include "mkdir.h" #include "parse-util.h" #include "proc-cmdline.h" diff --git a/src/run/run.c b/src/run/run.c index 38a482bb117..df6a4f0074a 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -33,6 +33,7 @@ #include "event-util.h" #include "fd-util.h" #include "formats-util.h" +#include "parse-util.h" #include "path-util.h" #include "ptyfwd.h" #include "signal-util.h" @@ -41,7 +42,6 @@ #include "terminal-util.h" #include "unit-name.h" #include "user-util.h" -#include "parse-util.h" static bool arg_ask_password = true; static bool arg_scope = false; diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index 79f5a605796..35f2e1b67dd 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -22,8 +22,8 @@ #include #include -#include "alloc-util.h" #include "acl-util.h" +#include "alloc-util.h" #include "string-util.h" #include "strv.h" #include "user-util.h" diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c index 8e36067f745..30e03c0652f 100644 --- a/src/shared/acpi-fpdt.c +++ b/src/shared/acpi-fpdt.c @@ -25,8 +25,8 @@ #include #include -#include "alloc-util.h" #include "acpi-fpdt.h" +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "time-util.h" diff --git a/src/shared/architecture.c b/src/shared/architecture.c index e2efa4272b7..73937bd5a7f 100644 --- a/src/shared/architecture.c +++ b/src/shared/architecture.c @@ -21,9 +21,9 @@ #include +#include "architecture.h" #include "string-table.h" #include "string-util.h" -#include "architecture.h" int uname_architecture(void) { diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c index ecbe1aaa0f9..879aca93744 100644 --- a/src/shared/boot-timestamps.c +++ b/src/shared/boot-timestamps.c @@ -20,8 +20,8 @@ along with systemd; If not, see . ***/ -#include "boot-timestamps.h" #include "acpi-fpdt.h" +#include "boot-timestamps.h" #include "efivars.h" int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) { diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c index 835fe524234..71cc613704c 100644 --- a/src/shared/clean-ipc.c +++ b/src/shared/clean-ipc.c @@ -29,13 +29,13 @@ #include #include "clean-ipc.h" +#include "dirent-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" #include "string-util.h" #include "strv.h" #include "util.h" -#include "dirent-util.h" static int clean_sysvipc_shm(uid_t delete_uid) { _cleanup_fclose_ FILE *f = NULL; diff --git a/src/shared/efivars.c b/src/shared/efivars.c index 86bb0b57c3d..89deeb9b550 100644 --- a/src/shared/efivars.c +++ b/src/shared/efivars.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include -#include #include +#include +#include #include "alloc-util.h" #include "dirent-util.h" diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c index e1782878726..5acfb0191b4 100644 --- a/src/shared/firewall-util.c +++ b/src/shared/firewall-util.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include #include #include +#include #include #include #include diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index d71f379e767..4a82bd18cde 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -19,18 +19,18 @@ along with systemd; If not, see . ***/ -#include +#include #include +#include #include -#include #include "alloc-util.h" -#include "util.h" -#include "strv.h" -#include "path-util.h" #include "install.h" -#include "string-util.h" #include "path-lookup.h" +#include "path-util.h" +#include "string-util.h" +#include "strv.h" +#include "util.h" int user_config_home(char **config_home) { const char *e; diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c index 63e81f48949..2666b8f7e22 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ +#include #include #include -#include #include #include "alloc-util.h" diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c index c518cf83ec4..09baf51661c 100644 --- a/src/shared/seccomp-util.c +++ b/src/shared/seccomp-util.c @@ -21,9 +21,9 @@ #include +#include "seccomp-util.h" #include "string-util.h" #include "util.h" -#include "seccomp-util.h" const char* seccomp_arch_to_string(uint32_t c) { diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c index 29db855c677..3fcea61873b 100644 --- a/src/shared/spawn-ask-password-agent.c +++ b/src/shared/spawn-ask-password-agent.c @@ -25,8 +25,8 @@ #include "log.h" #include "process-util.h" -#include "util.h" #include "spawn-ask-password-agent.h" +#include "util.h" static pid_t agent_pid = 0; diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c index ec6e5a8312e..8ea6cb830bf 100644 --- a/src/shared/spawn-polkit-agent.c +++ b/src/shared/spawn-polkit-agent.c @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ -#include -#include -#include #include #include +#include +#include +#include #include "fd-util.h" #include "io-util.h" diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c index 21cb82ea1cc..70caa542e74 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c @@ -30,8 +30,8 @@ #include "fileio.h" #include "log.h" #include "string-util.h" -#include "util.h" #include "sysctl-util.h" +#include "util.h" char *sysctl_normalize(char *s) { char *n; diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c index d58f9873d50..7131e94cdb7 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c @@ -19,15 +19,15 @@ along with systemd; If not, see . ***/ -#include #include #include +#include #include #include -#include "watchdog.h" -#include "log.h" #include "fd-util.h" +#include "log.h" +#include "watchdog.h" static int watchdog_fd = -1; static usec_t watchdog_timeout = USEC_INFINITY; diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c index a5b66a7d2f2..35479d67c1c 100644 --- a/src/test/test-architecture.c +++ b/src/test/test-architecture.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include "virt.h" #include "architecture.h" -#include "util.h" #include "log.h" +#include "util.h" +#include "virt.h" int main(int argc, char *argv[]) { int a, v; diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c index 06d93af5332..fab33d20c7d 100644 --- a/src/test/test-boot-timestamps.c +++ b/src/test/test-boot-timestamps.c @@ -20,11 +20,11 @@ along with systemd; If not, see . ***/ -#include "util.h" -#include "log.h" +#include "acpi-fpdt.h" #include "boot-timestamps.h" #include "efivars.h" -#include "acpi-fpdt.h" +#include "log.h" +#include "util.h" static int test_acpi_fpdt(void) { usec_t loader_start; diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 85b0d607d63..27460135226 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -21,10 +21,10 @@ #include -#include "manager.h" -#include "unit.h" #include "macro.h" +#include "manager.h" #include "test-helper.h" +#include "unit.h" static int test_cgroup_mask(void) { Manager *m = NULL; diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 954ed0d9e07..4f14c587883 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -19,12 +19,12 @@ along with systemd; If not, see . ***/ -#include #include +#include #include -#include "manager.h" #include "bus-util.h" +#include "manager.h" int main(int argc, char *argv[]) { _cleanup_bus_error_free_ sd_bus_error err = SD_BUS_ERROR_NULL; diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index bde3c7c3cfc..871c71e171a 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include "alloc-util.h" diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c index d636e427c4d..ff66bde0947 100644 --- a/src/test/test-firewall-util.c +++ b/src/test/test-firewall-util.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "log.h" #include "firewall-util.h" +#include "log.h" #define MAKE_IN_ADDR_UNION(a,b,c,d) (union in_addr_union) { .in.s_addr = htobe32((uint32_t) (a) << 24 | (uint32_t) (b) << 16 | (uint32_t) (c) << 8 | (uint32_t) (d))} diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c index d0e65001f52..83cea360e69 100644 --- a/src/test/test-hashmap.c +++ b/src/test/test-hashmap.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "util.h" #include "hashmap.h" +#include "util.h" void test_hashmap_funcs(void); void test_ordered_hashmap_funcs(void); diff --git a/src/test/test-install.c b/src/test/test-install.c index 359b2623476..ef6f1efb896 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "install.h" diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c index af0d76e8947..75ce3a349e3 100644 --- a/src/test/test-job-type.c +++ b/src/test/test-job-type.c @@ -22,8 +22,8 @@ #include #include "job.h" -#include "unit.h" #include "service.h" +#include "unit.h" int main(int argc, char*argv[]) { JobType a, b, c, ab, bc, ab_c, bc_a, a_bc; diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index 350eaf734dd..422926ef456 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -24,7 +24,6 @@ #include #include "libudev.h" - #include "string-util.h" #include "udev-util.h" #include "util.h" diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c index 97650753657..427c698d1d0 100644 --- a/src/test/test-locale-util.c +++ b/src/test/test-locale-util.c @@ -19,8 +19,8 @@ #include "locale-util.h" -#include "strv.h" #include "macro.h" +#include "strv.h" static void test_get_locales(void) { _cleanup_strv_free_ char **locales = NULL; diff --git a/src/test/test-log.c b/src/test/test-log.c index 9dcfa2f2748..a01df9b0492 100644 --- a/src/test/test-log.c +++ b/src/test/test-log.c @@ -22,9 +22,9 @@ #include #include +#include "formats-util.h" #include "log.h" #include "util.h" -#include "formats-util.h" int main(int argc, char* argv[]) { diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c index e3e5a95add2..556938a0f89 100644 --- a/src/test/test-loopback.c +++ b/src/test/test-loopback.c @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ -#include #include +#include -#include "loopback-setup.h" #include "log.h" +#include "loopback-setup.h" int main(int argc, char* argv[]) { int r; diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 3050be9e9d1..1175114a3a9 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -22,8 +22,8 @@ #include #include -#include "namespace.h" #include "log.h" +#include "namespace.h" int main(int argc, char *argv[]) { const char * const writable[] = { diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c index 462b55cdb3d..990b834c79a 100644 --- a/src/test/test-ratelimit.c +++ b/src/test/test-ratelimit.c @@ -19,9 +19,9 @@ #include +#include "macro.h" #include "ratelimit.h" #include "time-util.h" -#include "macro.h" static void test_ratelimit_test(void) { int i; diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index ebc9110c4d7..8396ae60f3d 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -21,8 +21,8 @@ #include -#include "manager.h" #include "macro.h" +#include "manager.h" int main(int argc, char *argv[]) { Manager *m = NULL; diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c index 0200e146ad8..7e398901101 100644 --- a/src/test/test-siphash24.c +++ b/src/test/test-siphash24.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "util.h" #include "siphash24.h" +#include "util.h" #define ITERATIONS 10000000ULL diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c index 4308ddfb64e..fb115ce4f3e 100644 --- a/src/test/test-sleep.c +++ b/src/test/test-sleep.c @@ -21,10 +21,10 @@ #include -#include "util.h" #include "log.h" #include "sleep-config.h" #include "strv.h" +#include "util.h" static void test_sleep(void) { _cleanup_strv_free_ char diff --git a/src/test/test-tables.c b/src/test/test-tables.c index da27cde3dab..aef992ee3cc 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -36,6 +36,7 @@ #include "logs-show.h" #include "mount.h" #include "path.h" +#include "rlimit-util.h" #include "scope.h" #include "service.h" #include "slice.h" @@ -43,13 +44,11 @@ #include "socket.h" #include "swap.h" #include "target.h" +#include "test-tables.h" #include "timer.h" #include "unit-name.h" #include "unit.h" #include "util.h" -#include "rlimit-util.h" - -#include "test-tables.h" int main(int argc, char **argv) { test_table(architecture, ARCHITECTURE); diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index e940b5a204c..84b448a0957 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -18,8 +18,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "fd-util.h" #include "fileio.h" diff --git a/src/test/test-time.c b/src/test/test-time.c index 820e4aaee25..8896b2c92bb 100644 --- a/src/test/test-time.c +++ b/src/test/test-time.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ -#include "time-util.h" #include "strv.h" +#include "time-util.h" static void test_parse_sec(void) { usec_t u; diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c index ec52db262ca..b18b3fca0e2 100644 --- a/src/test/test-unaligned.c +++ b/src/test/test-unaligned.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "unaligned.h" #include "sparse-endian.h" +#include "unaligned.h" #include "util.h" static uint8_t data[] = { diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c index 0af8349732e..e98be5763ca 100644 --- a/src/test/test-utf8.c +++ b/src/test/test-utf8.c @@ -20,9 +20,9 @@ ***/ #include "alloc-util.h" +#include "string-util.h" #include "utf8.h" #include "util.h" -#include "string-util.h" static void test_utf8_is_printable(void) { assert_se(utf8_is_printable("ascii is valid\tunicode", 22)); diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index 2e5d0c3aaeb..d10d9f49af3 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -21,8 +21,8 @@ #include -#include "watchdog.h" #include "log.h" +#include "watchdog.h" int main(int argc, char *argv[]) { usec_t t = 10 * USEC_PER_SEC; diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index 1e414664ce7..be3471013d4 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -37,10 +37,9 @@ #include #include -#include "libudev.h" - #include "fd-util.h" #include "libudev-private.h" +#include "libudev.h" #include "log.h" #include "udev-util.h" diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 72f284f7108..3ca576d75b8 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -34,9 +34,8 @@ #include #include -#include "libudev.h" - #include "libudev-private.h" +#include "libudev.h" #include "random-util.h" /* device info */ diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c index 67b750c4b36..462fab7623b 100644 --- a/src/udev/mtd_probe/mtd_probe.c +++ b/src/udev/mtd_probe/mtd_probe.c @@ -17,14 +17,14 @@ * Boston, MA 02110-1301 USA */ +#include +#include #include +#include #include -#include -#include #include -#include +#include #include -#include #include "mtd_probe.h" diff --git a/src/udev/mtd_probe/probe_smartmedia.c b/src/udev/mtd_probe/probe_smartmedia.c index a007ccee2fc..6a6c5522a76 100644 --- a/src/udev/mtd_probe/probe_smartmedia.c +++ b/src/udev/mtd_probe/probe_smartmedia.c @@ -17,15 +17,16 @@ * Boston, MA 02110-1301 USA */ +#include +#include +#include #include #include -#include #include -#include #include -#include +#include #include -#include + #include "mtd_probe.h" static const uint8_t cis_signature[] = { diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index 46556916429..ff16344316c 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -29,10 +29,9 @@ #include #include -#include "libudev.h" - #include "fd-util.h" #include "libudev-private.h" +#include "libudev.h" #include "scsi_id.h" #include "string-util.h" #include "udev-util.h" diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index c7ef783684b..71a518a4537 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -33,9 +33,8 @@ #include #include -#include "libudev.h" - #include "libudev-private.h" +#include "libudev.h" #include "random-util.h" #include "scsi.h" #include "scsi_id.h" diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c index bbda9de08c1..3ebe36f0433 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/udev/udev-builtin-uaccess.c @@ -18,9 +18,9 @@ * along with this program. If not, see . */ +#include #include #include -#include #include "sd-login.h" diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index 1e05be51a54..962de22f43b 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -10,13 +10,13 @@ */ #include -#include +#include #include +#include #include -#include -#include #include #include +#include #include "alloc-util.h" #include "fd-util.h" diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 9aa5ab185d5..f1fdccaed88 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -#include -#include #include +#include #include -#include +#include #include +#include #include "udev.h" diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c index 78170463b65..989decbe955 100644 --- a/src/udev/udevadm-control.c +++ b/src/udev/udevadm-control.c @@ -13,15 +13,15 @@ */ #include +#include +#include #include #include -#include #include #include -#include -#include "udev.h" #include "udev-util.h" +#include "udev.h" static void print_help(void) { printf("%s control COMMAND\n\n" diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c index 30aa53feb2b..f9cb5e63a24 100644 --- a/src/udev/udevadm-monitor.c +++ b/src/udev/udevadm-monitor.c @@ -15,15 +15,15 @@ * along with this program. If not, see . */ -#include -#include -#include #include -#include #include -#include -#include +#include +#include +#include +#include #include +#include +#include #include "fd-util.h" #include "formats-util.h" diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index c25071b0fee..6a5dc6e9e44 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include #include "parse-util.h" #include "udev.h" diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c index 607d78a0191..aec6676a332 100644 --- a/src/udev/v4l_id/v4l_id.c +++ b/src/udev/v4l_id/v4l_id.c @@ -13,17 +13,17 @@ * General Public License for more details: */ -#include -#include -#include #include -#include -#include +#include #include #include -#include -#include +#include +#include +#include #include +#include +#include +#include #include #include "fd-util.h" -- 2.39.2