diff options
Diffstat (limited to 'src/grp-system/libcore')
56 files changed, 205 insertions, 153 deletions
diff --git a/src/grp-system/libcore/automount.c b/src/grp-system/libcore/automount.c index 145ed5ab5d..ca5deece11 100644 --- a/src/grp-system/libcore/automount.c +++ b/src/grp-system/libcore/automount.c @@ -20,7 +20,6 @@ #include <errno.h> #include <fcntl.h> #include <limits.h> -#include <linux/auto_dev-ioctl.h> #include <linux/auto_fs4.h> #include <sys/epoll.h> #include <sys/mount.h> @@ -29,17 +28,12 @@ #include "basic/alloc-util.h" #include "basic/async.h" -#include "automount.h" -#include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "dbus-automount.h" #include "basic/fd-util.h" #include "basic/formats-util.h" #include "basic/io-util.h" #include "basic/label.h" #include "basic/mkdir.h" #include "basic/mount-util.h" -#include "mount.h" #include "basic/parse-util.h" #include "basic/path-util.h" #include "basic/process-util.h" @@ -48,6 +42,13 @@ #include "basic/string-table.h" #include "basic/string-util.h" #include "basic/unit-name.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" + +#include "automount.h" +#include "dbus-automount.h" +#include "linux/auto_dev-ioctl.h" +#include "mount.h" #include "unit.h" static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = { diff --git a/src/grp-system/libcore/bus-policy.c b/src/grp-system/libcore/bus-policy.c index cc228bc42f..b6dc2f5438 100644 --- a/src/grp-system/libcore/bus-policy.c +++ b/src/grp-system/libcore/bus-policy.c @@ -20,12 +20,13 @@ #include <stdlib.h> #include "basic/alloc-util.h" -#include "sd-bus/bus-kernel.h" -#include "bus-policy.h" -#include "sd-bus/kdbus.h" #include "basic/string-table.h" #include "basic/user-util.h" #include "basic/util.h" +#include "sd-bus/bus-kernel.h" +#include "sd-bus/kdbus.h" + +#include "bus-policy.h" int bus_kernel_translate_access(BusPolicyAccess access) { assert(access >= 0); diff --git a/src/grp-system/libcore/bus-policy.h b/src/grp-system/libcore/bus-policy.h index a6d19c1e9a..8cb6910c00 100644 --- a/src/grp-system/libcore/bus-policy.h +++ b/src/grp-system/libcore/bus-policy.h @@ -19,9 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus/kdbus.h" #include "basic/list.h" #include "basic/macro.h" +#include "sd-bus/kdbus.h" typedef struct BusNamePolicy BusNamePolicy; diff --git a/src/grp-system/libcore/busname.c b/src/grp-system/libcore/busname.c index 765fd7a442..5d85c20730 100644 --- a/src/grp-system/libcore/busname.c +++ b/src/grp-system/libcore/busname.c @@ -20,22 +20,23 @@ #include <sys/mman.h> #include "basic/alloc-util.h" -#include "sd-bus/bus-internal.h" -#include "sd-bus/bus-kernel.h" -#include "bus-policy.h" -#include "shared/bus-util.h" -#include "busname.h" -#include "dbus-busname.h" #include "basic/fd-util.h" #include "basic/formats-util.h" -#include "sd-bus/kdbus.h" #include "basic/parse-util.h" #include "basic/process-util.h" -#include "service.h" #include "basic/signal-util.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/string-util.h" +#include "sd-bus/bus-internal.h" +#include "sd-bus/bus-kernel.h" +#include "sd-bus/kdbus.h" +#include "shared/bus-util.h" + +#include "bus-policy.h" +#include "busname.h" +#include "dbus-busname.h" +#include "service.h" static const UnitActiveState state_translation_table[_BUSNAME_STATE_MAX] = { [BUSNAME_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/busname.h b/src/grp-system/libcore/busname.h index a8562db458..aa7f0ecb1b 100644 --- a/src/grp-system/libcore/busname.h +++ b/src/grp-system/libcore/busname.h @@ -22,8 +22,8 @@ typedef struct BusName BusName; typedef struct BusNamePolicy BusNamePolicy; -#include "unit.h" #include "bus-policy.h" +#include "unit.h" typedef enum BusNameResult { BUSNAME_SUCCESS, diff --git a/src/grp-system/libcore/cgroup.c b/src/grp-system/libcore/cgroup.c index 43d494cee7..df850ec68f 100644 --- a/src/grp-system/libcore/cgroup.c +++ b/src/grp-system/libcore/cgroup.c @@ -22,7 +22,6 @@ #include "basic/alloc-util.h" #include "basic/cgroup-util.h" -#include "cgroup.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/fs-util.h" @@ -30,9 +29,11 @@ #include "basic/path-util.h" #include "basic/process-util.h" #include "basic/special.h" +#include "basic/stdio-util.h" #include "basic/string-table.h" #include "basic/string-util.h" -#include "basic/stdio-util.h" + +#include "cgroup.h" #define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC) diff --git a/src/grp-system/libcore/cgroup.h b/src/grp-system/libcore/cgroup.h index 69ff9832bf..f0072986b6 100644 --- a/src/grp-system/libcore/cgroup.h +++ b/src/grp-system/libcore/cgroup.h @@ -21,9 +21,9 @@ #include <stdbool.h> +#include "basic/cgroup-util.h" #include "basic/list.h" #include "basic/time-util.h" -#include "basic/cgroup-util.h" typedef struct CGroupContext CGroupContext; typedef struct CGroupDeviceAllow CGroupDeviceAllow; diff --git a/src/grp-system/libcore/dbus-automount.c b/src/grp-system/libcore/dbus-automount.c index bc44dc1c0a..2949c49a3f 100644 --- a/src/grp-system/libcore/dbus-automount.c +++ b/src/grp-system/libcore/dbus-automount.c @@ -17,10 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "automount.h" +#include "basic/string-util.h" #include "shared/bus-util.h" + +#include "automount.h" #include "dbus-automount.h" -#include "basic/string-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, automount_result, AutomountResult); diff --git a/src/grp-system/libcore/dbus-busname.c b/src/grp-system/libcore/dbus-busname.c index 80e7484f46..65815bb826 100644 --- a/src/grp-system/libcore/dbus-busname.c +++ b/src/grp-system/libcore/dbus-busname.c @@ -17,10 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "basic/string-util.h" #include "shared/bus-util.h" + #include "busname.h" #include "dbus-busname.h" -#include "basic/string-util.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult); diff --git a/src/grp-system/libcore/dbus-cgroup.c b/src/grp-system/libcore/dbus-cgroup.c index 86f7c626c4..d707ac51c3 100644 --- a/src/grp-system/libcore/dbus-cgroup.c +++ b/src/grp-system/libcore/dbus-cgroup.c @@ -18,13 +18,14 @@ ***/ #include "basic/alloc-util.h" -#include "shared/bus-util.h" #include "basic/cgroup-util.h" -#include "cgroup.h" -#include "dbus-cgroup.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/path-util.h" +#include "shared/bus-util.h" + +#include "cgroup.h" +#include "dbus-cgroup.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); diff --git a/src/grp-system/libcore/dbus-job.c b/src/grp-system/libcore/dbus-job.c index dde6aa28ef..ee1774da36 100644 --- a/src/grp-system/libcore/dbus-job.c +++ b/src/grp-system/libcore/dbus-job.c @@ -20,12 +20,13 @@ #include <systemd/sd-bus.h> #include "basic/alloc-util.h" +#include "basic/log.h" +#include "basic/string-util.h" + #include "dbus-job.h" #include "dbus.h" #include "job.h" -#include "basic/log.h" #include "selinux-access.h" -#include "basic/string-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, job_type, JobType); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_state, job_state, JobState); diff --git a/src/grp-system/libcore/dbus-kill.c b/src/grp-system/libcore/dbus-kill.c index cd76682298..ba7a3f3b72 100644 --- a/src/grp-system/libcore/dbus-kill.c +++ b/src/grp-system/libcore/dbus-kill.c @@ -17,10 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "basic/signal-util.h" #include "shared/bus-util.h" + #include "dbus-kill.h" #include "kill.h" -#include "basic/signal-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode); diff --git a/src/grp-system/libcore/dbus-manager.c b/src/grp-system/libcore/dbus-manager.c index 59f8a7908a..b2ca867987 100644 --- a/src/grp-system/libcore/dbus-manager.c +++ b/src/grp-system/libcore/dbus-manager.c @@ -24,28 +24,29 @@ #include "basic/alloc-util.h" #include "basic/architecture.h" #include "basic/build.h" -#include "sd-bus/bus-common-errors.h" #include "basic/clock-util.h" -#include "dbus-execute.h" -#include "dbus-job.h" -#include "dbus-manager.h" -#include "dbus-unit.h" -#include "dbus.h" #include "basic/env-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/formats-util.h" -#include "shared/install.h" #include "basic/log.h" #include "basic/path-util.h" -#include "selinux-access.h" #include "basic/stat-util.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/syslog-util.h" #include "basic/virt.h" +#include "sd-bus/bus-common-errors.h" +#include "shared/install.h" #include "shared/watchdog.h" +#include "dbus-execute.h" +#include "dbus-job.h" +#include "dbus-manager.h" +#include "dbus-unit.h" +#include "dbus.h" +#include "selinux-access.h" + static int property_get_version( sd_bus *bus, const char *path, diff --git a/src/grp-system/libcore/dbus-mount.c b/src/grp-system/libcore/dbus-mount.c index e6e824b6b9..837a262f61 100644 --- a/src/grp-system/libcore/dbus-mount.c +++ b/src/grp-system/libcore/dbus-mount.c @@ -17,13 +17,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "basic/string-util.h" #include "shared/bus-util.h" + #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-kill.h" #include "dbus-mount.h" #include "mount.h" -#include "basic/string-util.h" #include "unit.h" static int property_get_what( diff --git a/src/grp-system/libcore/dbus-path.c b/src/grp-system/libcore/dbus-path.c index 2f2a65d4c1..d312652be4 100644 --- a/src/grp-system/libcore/dbus-path.c +++ b/src/grp-system/libcore/dbus-path.c @@ -17,10 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "basic/string-util.h" #include "shared/bus-util.h" + #include "dbus-path.h" #include "path.h" -#include "basic/string-util.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, path_result, PathResult); diff --git a/src/grp-system/libcore/dbus-scope.c b/src/grp-system/libcore/dbus-scope.c index 3a9c3b98ec..9ecc01d275 100644 --- a/src/grp-system/libcore/dbus-scope.c +++ b/src/grp-system/libcore/dbus-scope.c @@ -21,6 +21,7 @@ #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-internal.h" #include "shared/bus-util.h" + #include "dbus-cgroup.h" #include "dbus-kill.h" #include "dbus-scope.h" diff --git a/src/grp-system/libcore/dbus-service.c b/src/grp-system/libcore/dbus-service.c index 463d9da4e1..a666c9db95 100644 --- a/src/grp-system/libcore/dbus-service.c +++ b/src/grp-system/libcore/dbus-service.c @@ -19,17 +19,18 @@ #include "basic/alloc-util.h" #include "basic/async.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/path-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" #include "shared/bus-util.h" + #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-kill.h" #include "dbus-service.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/path-util.h" #include "service.h" -#include "basic/string-util.h" -#include "basic/strv.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType); diff --git a/src/grp-system/libcore/dbus-socket.c b/src/grp-system/libcore/dbus-socket.c index 53c9911991..4d99628725 100644 --- a/src/grp-system/libcore/dbus-socket.c +++ b/src/grp-system/libcore/dbus-socket.c @@ -18,12 +18,13 @@ ***/ #include "basic/alloc-util.h" +#include "basic/string-util.h" #include "shared/bus-util.h" + #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-socket.h" #include "socket.h" -#include "basic/string-util.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, socket_result, SocketResult); diff --git a/src/grp-system/libcore/dbus-swap.c b/src/grp-system/libcore/dbus-swap.c index 2cfc8bd496..fc911b038f 100644 --- a/src/grp-system/libcore/dbus-swap.c +++ b/src/grp-system/libcore/dbus-swap.c @@ -18,11 +18,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "basic/string-util.h" #include "shared/bus-util.h" + #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-swap.h" -#include "basic/string-util.h" #include "swap.h" #include "unit.h" diff --git a/src/grp-system/libcore/dbus-timer.c b/src/grp-system/libcore/dbus-timer.c index be84522036..02036de42f 100644 --- a/src/grp-system/libcore/dbus-timer.c +++ b/src/grp-system/libcore/dbus-timer.c @@ -18,9 +18,10 @@ ***/ #include "basic/alloc-util.h" +#include "basic/strv.h" #include "shared/bus-util.h" + #include "dbus-timer.h" -#include "basic/strv.h" #include "timer.h" #include "unit.h" diff --git a/src/grp-system/libcore/dbus-unit.c b/src/grp-system/libcore/dbus-unit.c index dd5d6e4c5e..31fbb0d54d 100644 --- a/src/grp-system/libcore/dbus-unit.c +++ b/src/grp-system/libcore/dbus-unit.c @@ -20,20 +20,21 @@ #include <systemd/sd-bus.h> #include "basic/alloc-util.h" -#include "sd-bus/bus-common-errors.h" #include "basic/cgroup-util.h" -#include "dbus-unit.h" -#include "dbus.h" #include "basic/fd-util.h" #include "basic/locale-util.h" #include "basic/log.h" #include "basic/process-util.h" -#include "selinux-access.h" #include "basic/signal-util.h" #include "basic/special.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/user-util.h" +#include "sd-bus/bus-common-errors.h" + +#include "dbus-unit.h" +#include "dbus.h" +#include "selinux-access.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_job_mode, job_mode, JobMode); diff --git a/src/grp-system/libcore/dbus.c b/src/grp-system/libcore/dbus.c index d1d6248041..e8e57e6a89 100644 --- a/src/grp-system/libcore/dbus.c +++ b/src/grp-system/libcore/dbus.c @@ -24,10 +24,20 @@ #include <systemd/sd-bus.h> #include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/special.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/strxcpyx.h" +#include "basic/user-util.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-internal.h" #include "shared/bus-util.h" + #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-job.h" @@ -35,16 +45,7 @@ #include "dbus-manager.h" #include "dbus-unit.h" #include "dbus.h" -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/missing.h" -#include "basic/mkdir.h" #include "selinux-access.h" -#include "basic/special.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/strxcpyx.h" -#include "basic/user-util.h" #define CONNECTIONS_MAX 4096 diff --git a/src/grp-system/libcore/device.c b/src/grp-system/libcore/device.c index 10e9e9ae76..11ee2ad047 100644 --- a/src/grp-system/libcore/device.c +++ b/src/grp-system/libcore/device.c @@ -20,19 +20,20 @@ #include <errno.h> #include <sys/epoll.h> -#include "libudev.h" +#include <libudev.h> #include "basic/alloc-util.h" -#include "dbus-device.h" -#include "device.h" #include "basic/log.h" #include "basic/parse-util.h" #include "basic/path-util.h" #include "basic/stat-util.h" #include "basic/string-util.h" -#include "swap.h" -#include "shared/udev-util.h" #include "basic/unit-name.h" +#include "shared/udev-util.h" + +#include "dbus-device.h" +#include "device.h" +#include "swap.h" #include "unit.h" static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = { diff --git a/src/grp-system/libcore/execute.h b/src/grp-system/libcore/execute.h index 190a56f443..38f21125cb 100644 --- a/src/grp-system/libcore/execute.h +++ b/src/grp-system/libcore/execute.h @@ -33,6 +33,7 @@ typedef struct ExecParameters ExecParameters; #include "basic/fdset.h" #include "basic/list.h" #include "basic/missing.h" + #include "namespace.h" typedef enum ExecUtmpMode { diff --git a/src/grp-system/libcore/failure-action.c b/src/grp-system/libcore/failure-action.c index be76c15a37..ee6025e7e2 100644 --- a/src/grp-system/libcore/failure-action.c +++ b/src/grp-system/libcore/failure-action.c @@ -18,15 +18,16 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <sys/reboot.h> #include <linux/reboot.h> +#include <sys/reboot.h> -#include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "failure-action.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/terminal-util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" + +#include "failure-action.h" static void log_and_status(Manager *m, const char *message) { log_warning("%s", message); diff --git a/src/grp-system/libcore/failure-action.h b/src/grp-system/libcore/failure-action.h index 96c6b51cb2..87b091f46e 100644 --- a/src/grp-system/libcore/failure-action.h +++ b/src/grp-system/libcore/failure-action.h @@ -33,6 +33,7 @@ typedef enum FailureAction { } FailureAction; #include "basic/macro.h" + #include "manager.h" int failure_action(Manager *m, FailureAction action, const char *reboot_arg); diff --git a/src/grp-system/libcore/hostname-setup.c b/src/grp-system/libcore/hostname-setup.c index 0085c0d405..71e5649952 100644 --- a/src/grp-system/libcore/hostname-setup.c +++ b/src/grp-system/libcore/hostname-setup.c @@ -23,13 +23,14 @@ #include "basic/alloc-util.h" #include "basic/fileio.h" -#include "hostname-setup.h" #include "basic/hostname-util.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/string-util.h" #include "basic/util.h" +#include "hostname-setup.h" + int hostname_setup(void) { int r; _cleanup_free_ char *b = NULL; diff --git a/src/grp-system/libcore/ima-setup.c b/src/grp-system/libcore/ima-setup.c index c6eb358c9d..0b283d95f1 100644 --- a/src/grp-system/libcore/ima-setup.c +++ b/src/grp-system/libcore/ima-setup.c @@ -24,10 +24,11 @@ #include "basic/fd-util.h" #include "basic/fileio.h" -#include "ima-setup.h" #include "basic/log.h" #include "basic/util.h" +#include "ima-setup.h" + #define IMA_SECFS_DIR "/sys/kernel/security/ima" #define IMA_SECFS_POLICY IMA_SECFS_DIR "/policy" #define IMA_POLICY_PATH "/etc/ima/ima-policy" diff --git a/src/grp-system/libcore/job.c b/src/grp-system/libcore/job.c index 1a24a7f152..9dc44189e4 100644 --- a/src/grp-system/libcore/job.c +++ b/src/grp-system/libcore/job.c @@ -24,10 +24,7 @@ #include "basic/alloc-util.h" #include "basic/async.h" -#include "dbus-job.h" -#include "dbus.h" #include "basic/escape.h" -#include "job.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/parse-util.h" @@ -38,9 +35,13 @@ #include "basic/string-util.h" #include "basic/strv.h" #include "basic/terminal-util.h" -#include "unit.h" #include "basic/virt.h" +#include "dbus-job.h" +#include "dbus.h" +#include "job.h" +#include "unit.h" + Job* job_new_raw(Unit *unit) { Job *j; diff --git a/src/grp-system/libcore/kill.c b/src/grp-system/libcore/kill.c index 22e5bdb4fe..9f8b45971f 100644 --- a/src/grp-system/libcore/kill.c +++ b/src/grp-system/libcore/kill.c @@ -17,11 +17,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "kill.h" #include "basic/signal-util.h" #include "basic/string-table.h" #include "basic/util.h" +#include "kill.h" + void kill_context_init(KillContext *c) { assert(c); diff --git a/src/grp-system/libcore/killall.c b/src/grp-system/libcore/killall.c index 03bed30704..bc4d67ae21 100644 --- a/src/grp-system/libcore/killall.c +++ b/src/grp-system/libcore/killall.c @@ -25,7 +25,6 @@ #include "basic/alloc-util.h" #include "basic/fd-util.h" #include "basic/formats-util.h" -#include "killall.h" #include "basic/parse-util.h" #include "basic/process-util.h" #include "basic/set.h" @@ -33,6 +32,8 @@ #include "basic/terminal-util.h" #include "basic/util.h" +#include "killall.h" + #define TIMEOUT_USEC (10 * USEC_PER_SEC) static bool ignore_proc(pid_t pid, bool warn_rootfs) { diff --git a/src/grp-system/libcore/load-dropin.c b/src/grp-system/libcore/load-dropin.c index bb6cf0f989..9a65b5038b 100644 --- a/src/grp-system/libcore/load-dropin.c +++ b/src/grp-system/libcore/load-dropin.c @@ -18,12 +18,13 @@ ***/ -#include "shared/conf-parser.h" -#include "load-dropin.h" -#include "load-fragment.h" #include "basic/log.h" #include "basic/strv.h" #include "basic/unit-name.h" +#include "shared/conf-parser.h" + +#include "load-dropin.h" +#include "load-fragment.h" #include "unit.h" static int add_dependency_consumer( diff --git a/src/grp-system/libcore/load-dropin.h b/src/grp-system/libcore/load-dropin.h index 067661b1ff..d91cf05197 100644 --- a/src/grp-system/libcore/load-dropin.h +++ b/src/grp-system/libcore/load-dropin.h @@ -20,6 +20,7 @@ ***/ #include "shared/dropin.h" + #include "unit.h" /* Read service data supplementary drop-in directories */ diff --git a/src/grp-system/libcore/locale-setup.c b/src/grp-system/libcore/locale-setup.c index 1c9660cdf4..ed50796c09 100644 --- a/src/grp-system/libcore/locale-setup.c +++ b/src/grp-system/libcore/locale-setup.c @@ -22,13 +22,14 @@ #include "basic/env-util.h" #include "basic/fileio.h" -#include "locale-setup.h" #include "basic/locale-util.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/util.h" #include "basic/virt.h" +#include "locale-setup.h" + int locale_setup(char ***environment) { char **add; char *variables[_VARIABLE_LC_MAX] = {}; diff --git a/src/grp-system/libcore/machine-id-setup.c b/src/grp-system/libcore/machine-id-setup.c index 702cc90e89..28722b46f0 100644 --- a/src/grp-system/libcore/machine-id-setup.c +++ b/src/grp-system/libcore/machine-id-setup.c @@ -34,7 +34,6 @@ #include "basic/hexdecoct.h" #include "basic/io-util.h" #include "basic/log.h" -#include "machine-id-setup.h" #include "basic/macro.h" #include "basic/mkdir.h" #include "basic/mount-util.h" @@ -46,6 +45,8 @@ #include "basic/util.h" #include "basic/virt.h" +#include "machine-id-setup.h" + static int shorten_uuid(char destination[34], const char source[36]) { unsigned i, j; diff --git a/src/grp-system/libcore/mount-setup.c b/src/grp-system/libcore/mount-setup.c index 09df45c567..e90f0e918a 100644 --- a/src/grp-system/libcore/mount-setup.c +++ b/src/grp-system/libcore/mount-setup.c @@ -24,16 +24,12 @@ #include <unistd.h> #include "basic/alloc-util.h" -#include "shared/bus-util.h" #include "basic/cgroup-util.h" -#include "shared/dev-setup.h" -#include "shared/efivars.h" #include "basic/label.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/missing.h" #include "basic/mkdir.h" -#include "mount-setup.h" #include "basic/mount-util.h" #include "basic/path-util.h" #include "basic/set.h" @@ -42,6 +38,11 @@ #include "basic/user-util.h" #include "basic/util.h" #include "basic/virt.h" +#include "shared/bus-util.h" +#include "shared/dev-setup.h" +#include "shared/efivars.h" + +#include "mount-setup.h" typedef enum MountMode { MNT_NONE = 0, diff --git a/src/grp-system/libcore/mount.c b/src/grp-system/libcore/mount.c index ab6efd4a9c..d4af6c65f6 100644 --- a/src/grp-system/libcore/mount.c +++ b/src/grp-system/libcore/mount.c @@ -25,17 +25,12 @@ #include <systemd/sd-messages.h> #include "basic/alloc-util.h" -#include "dbus-mount.h" #include "basic/escape.h" #include "basic/exit-status.h" #include "basic/formats-util.h" -#include "shared/fstab-util.h" #include "basic/log.h" -#include "manager.h" #include "basic/mkdir.h" -#include "mount-setup.h" #include "basic/mount-util.h" -#include "mount.h" #include "basic/parse-util.h" #include "basic/path-util.h" #include "basic/process-util.h" @@ -44,6 +39,12 @@ #include "basic/string-util.h" #include "basic/strv.h" #include "basic/unit-name.h" +#include "shared/fstab-util.h" + +#include "dbus-mount.h" +#include "manager.h" +#include "mount-setup.h" +#include "mount.h" #include "unit.h" #define RETRY_UMOUNT_MAX 32 diff --git a/src/grp-system/libcore/namespace.c b/src/grp-system/libcore/namespace.c index f7c5364437..cb85074cce 100644 --- a/src/grp-system/libcore/namespace.c +++ b/src/grp-system/libcore/namespace.c @@ -18,22 +18,19 @@ ***/ #include <errno.h> +#include <linux/fs.h> #include <sched.h> #include <stdio.h> #include <string.h> #include <sys/mount.h> #include <sys/stat.h> #include <unistd.h> -#include <linux/fs.h> #include "basic/alloc-util.h" -#include "shared/dev-setup.h" #include "basic/fd-util.h" -#include "loopback-setup.h" #include "basic/missing.h" #include "basic/mkdir.h" #include "basic/mount-util.h" -#include "namespace.h" #include "basic/path-util.h" #include "basic/selinux-util.h" #include "basic/socket-util.h" @@ -43,6 +40,10 @@ #include "basic/umask-util.h" #include "basic/user-util.h" #include "basic/util.h" +#include "shared/dev-setup.h" + +#include "loopback-setup.h" +#include "namespace.h" #define DEV_MOUNT_OPTIONS (MS_NOSUID|MS_STRICTATIME|MS_NOEXEC) diff --git a/src/grp-system/libcore/path.c b/src/grp-system/libcore/path.c index 782e085174..ee1b9a3480 100644 --- a/src/grp-system/libcore/path.c +++ b/src/grp-system/libcore/path.c @@ -22,20 +22,21 @@ #include <sys/inotify.h> #include <unistd.h> -#include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "dbus-path.h" #include "basic/fd-util.h" #include "basic/fs-util.h" #include "basic/glob-util.h" #include "basic/macro.h" #include "basic/mkdir.h" -#include "path.h" #include "basic/special.h" #include "basic/stat-util.h" #include "basic/string-table.h" #include "basic/string-util.h" #include "basic/unit-name.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" + +#include "dbus-path.h" +#include "path.h" #include "unit.h" static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = { diff --git a/src/grp-system/libcore/scope.c b/src/grp-system/libcore/scope.c index baf1051375..c290529e14 100644 --- a/src/grp-system/libcore/scope.c +++ b/src/grp-system/libcore/scope.c @@ -21,15 +21,16 @@ #include <unistd.h> #include "basic/alloc-util.h" -#include "dbus-scope.h" -#include "load-dropin.h" #include "basic/log.h" -#include "scope.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/unit-name.h" + +#include "dbus-scope.h" +#include "load-dropin.h" +#include "scope.h" #include "unit.h" static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = { diff --git a/src/grp-system/libcore/selinux-access.h b/src/grp-system/libcore/selinux-access.h index 1b1a8418ec..8d91eea38f 100644 --- a/src/grp-system/libcore/selinux-access.h +++ b/src/grp-system/libcore/selinux-access.h @@ -22,6 +22,7 @@ #include <systemd/sd-bus.h> #include "shared/bus-util.h" + #include "manager.h" int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error); diff --git a/src/grp-system/libcore/service.c b/src/grp-system/libcore/service.c index 2845a841c3..9b7f7bd68c 100644 --- a/src/grp-system/libcore/service.c +++ b/src/grp-system/libcore/service.c @@ -23,10 +23,6 @@ #include "basic/alloc-util.h" #include "basic/async.h" -#include "sd-bus/bus-error.h" -#include "sd-bus/bus-kernel.h" -#include "shared/bus-util.h" -#include "dbus-service.h" #include "basic/def.h" #include "basic/env-util.h" #include "basic/escape.h" @@ -35,24 +31,29 @@ #include "basic/fileio.h" #include "basic/formats-util.h" #include "basic/fs-util.h" -#include "load-dropin.h" -#include "load-fragment.h" #include "basic/log.h" -#include "manager.h" #include "basic/parse-util.h" #include "basic/path-util.h" #include "basic/process-util.h" -#include "service.h" #include "basic/signal-util.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/unit-name.h" -#include "unit-printf.h" -#include "unit.h" #include "basic/utf8.h" #include "basic/util.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-kernel.h" +#include "shared/bus-util.h" + +#include "dbus-service.h" +#include "load-dropin.h" +#include "load-fragment.h" +#include "manager.h" +#include "service.h" +#include "unit-printf.h" +#include "unit.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/service.h b/src/grp-system/libcore/service.h index 66e2c387fe..e67e242ab1 100644 --- a/src/grp-system/libcore/service.h +++ b/src/grp-system/libcore/service.h @@ -23,9 +23,10 @@ typedef struct Service Service; typedef struct ServiceFDStore ServiceFDStore; #include "basic/exit-status.h" +#include "basic/ratelimit.h" + #include "kill.h" #include "path.h" -#include "basic/ratelimit.h" typedef enum ServiceRestart { SERVICE_RESTART_NO, diff --git a/src/grp-system/libcore/show-status.c b/src/grp-system/libcore/show-status.c index 03a3117f53..bb6889630d 100644 --- a/src/grp-system/libcore/show-status.c +++ b/src/grp-system/libcore/show-status.c @@ -21,11 +21,12 @@ #include "basic/fd-util.h" #include "basic/io-util.h" #include "basic/parse-util.h" -#include "show-status.h" #include "basic/string-util.h" #include "basic/terminal-util.h" #include "basic/util.h" +#include "show-status.h" + int parse_show_status(const char *v, ShowStatus *ret) { int r; diff --git a/src/grp-system/libcore/slice.c b/src/grp-system/libcore/slice.c index d9b3fa9525..d646b838ac 100644 --- a/src/grp-system/libcore/slice.c +++ b/src/grp-system/libcore/slice.c @@ -20,13 +20,14 @@ #include <errno.h> #include "basic/alloc-util.h" -#include "dbus-slice.h" #include "basic/log.h" -#include "slice.h" #include "basic/special.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/unit-name.h" + +#include "dbus-slice.h" +#include "slice.h" #include "unit.h" static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = { diff --git a/src/grp-system/libcore/smack-setup.c b/src/grp-system/libcore/smack-setup.c index 16eb234202..ab316b69c9 100644 --- a/src/grp-system/libcore/smack-setup.c +++ b/src/grp-system/libcore/smack-setup.c @@ -32,10 +32,11 @@ #include "basic/fileio.h" #include "basic/log.h" #include "basic/macro.h" -#include "smack-setup.h" #include "basic/string-util.h" #include "basic/util.h" +#include "smack-setup.h" + #ifdef HAVE_SMACK static int write_access2_rules(const char* srcdir) { diff --git a/src/grp-system/libcore/socket.c b/src/grp-system/libcore/socket.c index 7ee5edfef8..cb2cb884d0 100644 --- a/src/grp-system/libcore/socket.c +++ b/src/grp-system/libcore/socket.c @@ -20,19 +20,16 @@ #include <arpa/inet.h> #include <errno.h> #include <fcntl.h> +#include <linux/sctp.h> #include <mqueue.h> #include <netinet/tcp.h> #include <signal.h> #include <sys/epoll.h> #include <sys/stat.h> #include <unistd.h> -#include <linux/sctp.h> #include "basic/alloc-util.h" -#include "sd-bus/bus-error.h" -#include "shared/bus-util.h" #include "basic/copy.h" -#include "dbus-socket.h" #include "basic/def.h" #include "basic/exit-status.h" #include "basic/fd-util.h" @@ -48,15 +45,19 @@ #include "basic/selinux-util.h" #include "basic/signal-util.h" #include "basic/smack-util.h" -#include "socket.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/unit-name.h" +#include "basic/user-util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" + +#include "dbus-socket.h" +#include "socket.h" #include "unit-printf.h" #include "unit.h" -#include "basic/user-util.h" static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = { [SOCKET_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/socket.h b/src/grp-system/libcore/socket.h index 4f25eabd5d..6e485f51c3 100644 --- a/src/grp-system/libcore/socket.h +++ b/src/grp-system/libcore/socket.h @@ -21,9 +21,10 @@ typedef struct Socket Socket; +#include "basic/socket-util.h" + #include "mount.h" #include "service.h" -#include "basic/socket-util.h" typedef enum SocketExecCommand { SOCKET_EXEC_START_PRE, diff --git a/src/grp-system/libcore/swap.c b/src/grp-system/libcore/swap.c index c08057a9fe..b787fc15a1 100644 --- a/src/grp-system/libcore/swap.c +++ b/src/grp-system/libcore/swap.c @@ -22,26 +22,27 @@ #include <sys/stat.h> #include <unistd.h> -#include "libudev.h" +#include <libudev.h> #include "basic/alloc-util.h" -#include "dbus-swap.h" #include "basic/escape.h" #include "basic/exit-status.h" #include "basic/fd-util.h" #include "basic/formats-util.h" -#include "shared/fstab-util.h" #include "basic/parse-util.h" #include "basic/path-util.h" #include "basic/process-util.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/string-util.h" -#include "swap.h" -#include "shared/udev-util.h" #include "basic/unit-name.h" -#include "unit.h" #include "basic/virt.h" +#include "shared/fstab-util.h" +#include "shared/udev-util.h" + +#include "dbus-swap.h" +#include "swap.h" +#include "unit.h" static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { [SWAP_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/swap.h b/src/grp-system/libcore/swap.h index fbf66debdc..c2cbfc5d2a 100644 --- a/src/grp-system/libcore/swap.h +++ b/src/grp-system/libcore/swap.h @@ -20,7 +20,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "libudev.h" +#include <libudev.h> typedef struct Swap Swap; diff --git a/src/grp-system/libcore/target.c b/src/grp-system/libcore/target.c index 25630b80e5..e62a49be84 100644 --- a/src/grp-system/libcore/target.c +++ b/src/grp-system/libcore/target.c @@ -17,13 +17,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "dbus-target.h" #include "basic/log.h" #include "basic/special.h" #include "basic/string-util.h" #include "basic/unit-name.h" -#include "unit.h" + +#include "dbus-target.h" #include "target.h" +#include "unit.h" static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = { [TARGET_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/timer.c b/src/grp-system/libcore/timer.c index 45eec02dee..8b9fa71d27 100644 --- a/src/grp-system/libcore/timer.c +++ b/src/grp-system/libcore/timer.c @@ -20,20 +20,21 @@ #include <errno.h> #include "basic/alloc-util.h" -#include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "dbus-timer.h" #include "basic/fs-util.h" #include "basic/parse-util.h" #include "basic/random-util.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/string-util.h" -#include "timer.h" #include "basic/unit-name.h" -#include "unit.h" #include "basic/user-util.h" #include "basic/virt.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" + +#include "dbus-timer.h" +#include "timer.h" +#include "unit.h" static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = { [TIMER_DEAD] = UNIT_INACTIVE, diff --git a/src/grp-system/libcore/transaction.c b/src/grp-system/libcore/transaction.c index a0ff69e2dc..d19e19f978 100644 --- a/src/grp-system/libcore/transaction.c +++ b/src/grp-system/libcore/transaction.c @@ -21,11 +21,12 @@ #include <unistd.h> #include "basic/alloc-util.h" +#include "basic/terminal-util.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" -#include "basic/terminal-util.h" -#include "transaction.h" + #include "dbus-unit.h" +#include "transaction.h" static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependencies); diff --git a/src/grp-system/libcore/transaction.h b/src/grp-system/libcore/transaction.h index 73489af0e6..e89dad99bf 100644 --- a/src/grp-system/libcore/transaction.h +++ b/src/grp-system/libcore/transaction.h @@ -22,6 +22,7 @@ typedef struct Transaction Transaction; #include "basic/hashmap.h" + #include "job.h" #include "manager.h" #include "unit.h" diff --git a/src/grp-system/libcore/unit-printf.c b/src/grp-system/libcore/unit-printf.c index c64d45e251..14c36ab494 100644 --- a/src/grp-system/libcore/unit-printf.c +++ b/src/grp-system/libcore/unit-printf.c @@ -21,13 +21,14 @@ #include "basic/cgroup-util.h" #include "basic/formats-util.h" #include "basic/macro.h" -#include "shared/specifier.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/unit-name.h" +#include "basic/user-util.h" +#include "shared/specifier.h" + #include "unit-printf.h" #include "unit.h" -#include "basic/user-util.h" static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { Unit *u = userdata; diff --git a/src/grp-system/libcore/unit.c b/src/grp-system/libcore/unit.c index 3caa8baa26..f539c3971d 100644 --- a/src/grp-system/libcore/unit.c +++ b/src/grp-system/libcore/unit.c @@ -27,18 +27,10 @@ #include <systemd/sd-messages.h> #include "basic/alloc-util.h" -#include "sd-bus/bus-common-errors.h" -#include "shared/bus-util.h" #include "basic/cgroup-util.h" -#include "dbus-unit.h" -#include "dbus.h" -#include "shared/dropin.h" #include "basic/escape.h" -#include "execute.h" #include "basic/fileio-label.h" #include "basic/formats-util.h" -#include "load-dropin.h" -#include "load-fragment.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/missing.h" @@ -55,9 +47,18 @@ #include "basic/strv.h" #include "basic/umask-util.h" #include "basic/unit-name.h" -#include "unit.h" #include "basic/user-util.h" #include "basic/virt.h" +#include "sd-bus/bus-common-errors.h" +#include "shared/bus-util.h" +#include "shared/dropin.h" + +#include "dbus-unit.h" +#include "dbus.h" +#include "execute.h" +#include "load-dropin.h" +#include "load-fragment.h" +#include "unit.h" const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = &service_vtable, |