diff options
Diffstat (limited to 'src/grp-system')
81 files changed, 768 insertions, 768 deletions
diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c index e27ae4f5c5..2f5b1e4da3 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c +++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c @@ -19,15 +19,15 @@ #include <stdlib.h> -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/path-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" #include "manager.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "shared/pager.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-shared/pager.h" #include "analyze-verify.h" diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h index 7b89007fd0..33b809997a 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h +++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h @@ -21,6 +21,6 @@ #include <stdbool.h> -#include "shared/path-lookup.h" +#include "systemd-shared/path-lookup.h" int verify_units(char **filenames, UnitFileScope scope, bool check_man); diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze.c b/src/grp-system/grp-utils/systemd-analyze/analyze.c index e79a109651..ea775c8dd1 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze.c +++ b/src/grp-system/grp-utils/systemd-analyze/analyze.c @@ -25,22 +25,22 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/glob-util.h" -#include "basic/hashmap.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/parse-util.h" -#include "basic/special.h" -#include "basic/strv.h" -#include "basic/strxcpyx.h" -#include "basic/terminal-util.h" -#include "basic/unit-name.h" -#include "basic/util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-unit-util.h" -#include "shared/bus-util.h" -#include "shared/pager.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/strxcpyx.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/bus-unit-util.h" +#include "systemd-shared/pager.h" #include "analyze-verify.h" diff --git a/src/grp-system/grp-utils/systemd-delta/delta.c b/src/grp-system/grp-utils/systemd-delta/delta.c index 5da779624d..0142803b46 100644 --- a/src/grp-system/grp-utils/systemd-delta/delta.c +++ b/src/grp-system/grp-utils/systemd-delta/delta.c @@ -24,23 +24,23 @@ #include <sys/prctl.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/dirent-util.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/hashmap.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/util.h" -#include "shared/pager.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/pager.h" static const char prefixes[] = "/etc\0" diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c index 70866cacda..d4ca2551fa 100644 --- a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c +++ b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c @@ -23,24 +23,24 @@ #include <string.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/mkdir.h" -#include "basic/mount-util.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/proc-cmdline.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "basic/util.h" -#include "basic/virt.h" -#include "shared/fstab-util.h" -#include "shared/generator.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/fstab-util.h" +#include "systemd-shared/generator.h" #include "mount-setup.h" diff --git a/src/grp-system/grp-utils/systemd-run/run.c b/src/grp-system/grp-utils/systemd-run/run.c index 4aaf446177..a68938fb71 100644 --- a/src/grp-system/grp-utils/systemd-run/run.c +++ b/src/grp-system/grp-utils/systemd-run/run.c @@ -23,23 +23,23 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "basic/alloc-util.h" -#include "basic/calendarspec.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/signal-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/unit-name.h" -#include "basic/user-util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-unit-util.h" -#include "shared/bus-util.h" -#include "shared/ptyfwd.h" -#include "shared/spawn-polkit-agent.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/calendarspec.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" +#include "systemd-shared/bus-unit-util.h" +#include "systemd-shared/ptyfwd.h" +#include "systemd-shared/spawn-polkit-agent.h" static bool arg_ask_password = true; static bool arg_scope = false; diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c index de973034be..873cab1c5c 100644 --- a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c +++ b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c @@ -23,24 +23,24 @@ #include <stdio.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/dirent-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/hashmap.h" -#include "basic/hexdecoct.h" -#include "basic/log.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/set.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "basic/util.h" -#include "shared/install.h" -#include "shared/path-lookup.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/install.h" +#include "systemd-shared/path-lookup.h" static const struct { const char *path; diff --git a/src/grp-system/libcore/audit-fd.c b/src/grp-system/libcore/audit-fd.c index 8ea525eda3..12509951b7 100644 --- a/src/grp-system/libcore/audit-fd.c +++ b/src/grp-system/libcore/audit-fd.c @@ -27,9 +27,9 @@ #include <libaudit.h> #include <stdbool.h> -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/util.h" static bool initialized = false; static int audit_fd; diff --git a/src/grp-system/libcore/automount.c b/src/grp-system/libcore/automount.c index 30c30469ca..ffe84c0cbb 100644 --- a/src/grp-system/libcore/automount.c +++ b/src/grp-system/libcore/automount.c @@ -28,24 +28,24 @@ #include <linux/auto_dev-ioctl.h> #include <linux/auto_fs4.h> -#include "basic/alloc-util.h" -#include "basic/async.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 "basic/parse-util.h" -#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/unit-name.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/async.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/label.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" #include "automount.h" #include "dbus-automount.h" diff --git a/src/grp-system/libcore/bus-policy.c b/src/grp-system/libcore/bus-policy.c index b6dc2f5438..38fcfd5fa9 100644 --- a/src/grp-system/libcore/bus-policy.c +++ b/src/grp-system/libcore/bus-policy.c @@ -19,12 +19,12 @@ #include <stdlib.h> -#include "basic/alloc-util.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 "systemd-basic/alloc-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" #include "bus-policy.h" diff --git a/src/grp-system/libcore/bus-policy.h b/src/grp-system/libcore/bus-policy.h index 8cb6910c00..a338f29af6 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 "basic/list.h" -#include "basic/macro.h" #include "sd-bus/kdbus.h" +#include "systemd-basic/list.h" +#include "systemd-basic/macro.h" typedef struct BusNamePolicy BusNamePolicy; diff --git a/src/grp-system/libcore/busname.c b/src/grp-system/libcore/busname.c index f21a2d23c1..ff05c4194b 100644 --- a/src/grp-system/libcore/busname.c +++ b/src/grp-system/libcore/busname.c @@ -19,19 +19,19 @@ #include <sys/mman.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/parse-util.h" -#include "basic/process-util.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/bus-util.h" #include "sd-bus/kdbus.h" -#include "shared/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" #include "bus-policy.h" #include "busname.h" diff --git a/src/grp-system/libcore/cgroup.c b/src/grp-system/libcore/cgroup.c index 0c1365f329..e1143d28e1 100644 --- a/src/grp-system/libcore/cgroup.c +++ b/src/grp-system/libcore/cgroup.c @@ -20,18 +20,18 @@ #include <fcntl.h> #include <fnmatch.h> -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/parse-util.h" -#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 "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" #include "cgroup.h" diff --git a/src/grp-system/libcore/cgroup.h b/src/grp-system/libcore/cgroup.h index bf40c3cc74..0026609570 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 "systemd-basic/cgroup-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/time-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 2949c49a3f..7033c1b1d3 100644 --- a/src/grp-system/libcore/dbus-automount.c +++ b/src/grp-system/libcore/dbus-automount.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/string-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/string-util.h" #include "automount.h" #include "dbus-automount.h" diff --git a/src/grp-system/libcore/dbus-busname.c b/src/grp-system/libcore/dbus-busname.c index 65815bb826..8db3c67a73 100644 --- a/src/grp-system/libcore/dbus-busname.c +++ b/src/grp-system/libcore/dbus-busname.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/string-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/string-util.h" #include "busname.h" #include "dbus-busname.h" diff --git a/src/grp-system/libcore/dbus-cgroup.c b/src/grp-system/libcore/dbus-cgroup.c index da1c333043..30afc2f7e4 100644 --- a/src/grp-system/libcore/dbus-cgroup.c +++ b/src/grp-system/libcore/dbus-cgroup.c @@ -17,12 +17,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/path-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/path-util.h" #include "cgroup.h" #include "dbus-cgroup.h" diff --git a/src/grp-system/libcore/dbus-execute.c b/src/grp-system/libcore/dbus-execute.c index f7c217efc1..2578ce6552 100644 --- a/src/grp-system/libcore/dbus-execute.c +++ b/src/grp-system/libcore/dbus-execute.c @@ -23,29 +23,29 @@ #include <seccomp.h> #endif -#include "basic/af-list.h" -#include "basic/alloc-util.h" -#include "basic/capability-util.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/ioprio.h" -#include "basic/missing.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/rlimit-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/af-list.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/ioprio.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rlimit-util.h" #include "dbus-execute.h" #include "execute.h" #include "namespace.h" #ifdef HAVE_SECCOMP -#include "shared/seccomp-util.h" +#include "systemd-shared/seccomp-util.h" #endif -#include "basic/strv.h" -#include "basic/syslog-util.h" -#include "basic/utf8.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/syslog-util.h" +#include "systemd-basic/utf8.h" BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); diff --git a/src/grp-system/libcore/dbus-job.c b/src/grp-system/libcore/dbus-job.c index ee1774da36..e85d690cd2 100644 --- a/src/grp-system/libcore/dbus-job.c +++ b/src/grp-system/libcore/dbus-job.c @@ -19,9 +19,9 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-util.h" #include "dbus-job.h" #include "dbus.h" diff --git a/src/grp-system/libcore/dbus-kill.c b/src/grp-system/libcore/dbus-kill.c index 44bc2db7e2..e49a2333c1 100644 --- a/src/grp-system/libcore/dbus-kill.c +++ b/src/grp-system/libcore/dbus-kill.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/signal-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/signal-util.h" #include "dbus-kill.h" #include "kill.h" diff --git a/src/grp-system/libcore/dbus-manager.c b/src/grp-system/libcore/dbus-manager.c index c5684014d3..d38f5814fe 100644 --- a/src/grp-system/libcore/dbus-manager.c +++ b/src/grp-system/libcore/dbus-manager.c @@ -21,24 +21,24 @@ #include <sys/prctl.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/architecture.h" -#include "basic/build.h" -#include "basic/clock-util.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/log.h" -#include "basic/path-util.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 "systemd-basic/alloc-util.h" +#include "systemd-basic/architecture.h" +#include "systemd-basic/build.h" +#include "systemd-basic/clock-util.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/syslog-util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/install.h" +#include "systemd-shared/watchdog.h" #include "dbus-execute.h" #include "dbus-job.h" diff --git a/src/grp-system/libcore/dbus-mount.c b/src/grp-system/libcore/dbus-mount.c index 837a262f61..9dea002eec 100644 --- a/src/grp-system/libcore/dbus-mount.c +++ b/src/grp-system/libcore/dbus-mount.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/string-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/string-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/dbus-path.c b/src/grp-system/libcore/dbus-path.c index d312652be4..835f6d49bf 100644 --- a/src/grp-system/libcore/dbus-path.c +++ b/src/grp-system/libcore/dbus-path.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/string-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/string-util.h" #include "dbus-path.h" #include "path.h" diff --git a/src/grp-system/libcore/dbus-scope.c b/src/grp-system/libcore/dbus-scope.c index d319597c10..8dc0bd22ed 100644 --- a/src/grp-system/libcore/dbus-scope.c +++ b/src/grp-system/libcore/dbus-scope.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-internal.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" #include "dbus-cgroup.h" #include "dbus-kill.h" diff --git a/src/grp-system/libcore/dbus-service.c b/src/grp-system/libcore/dbus-service.c index a3524815bd..2e92caecaf 100644 --- a/src/grp-system/libcore/dbus-service.c +++ b/src/grp-system/libcore/dbus-service.c @@ -17,14 +17,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#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 "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/async.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/dbus-socket.c b/src/grp-system/libcore/dbus-socket.c index 4d99628725..14c295959e 100644 --- a/src/grp-system/libcore/dbus-socket.c +++ b/src/grp-system/libcore/dbus-socket.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/string-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/dbus-swap.c b/src/grp-system/libcore/dbus-swap.c index fc911b038f..bb486b9546 100644 --- a/src/grp-system/libcore/dbus-swap.c +++ b/src/grp-system/libcore/dbus-swap.c @@ -18,8 +18,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/string-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/string-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/dbus-timer.c b/src/grp-system/libcore/dbus-timer.c index ce454385f8..14f09b3d0e 100644 --- a/src/grp-system/libcore/dbus-timer.c +++ b/src/grp-system/libcore/dbus-timer.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/strv.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/strv.h" #include "dbus-timer.h" #include "timer.h" diff --git a/src/grp-system/libcore/dbus-unit.c b/src/grp-system/libcore/dbus-unit.c index 7e2a63b434..ef12ad66a3 100644 --- a/src/grp-system/libcore/dbus-unit.c +++ b/src/grp-system/libcore/dbus-unit.c @@ -19,18 +19,18 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/fd-util.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/process-util.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 "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" #include "dbus-unit.h" #include "dbus.h" diff --git a/src/grp-system/libcore/dbus.c b/src/grp-system/libcore/dbus.c index e8e57e6a89..0c5617ec44 100644 --- a/src/grp-system/libcore/dbus.c +++ b/src/grp-system/libcore/dbus.c @@ -23,20 +23,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 "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/strxcpyx.h" +#include "systemd-basic/user-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/grp-system/libcore/device.c b/src/grp-system/libcore/device.c index 11ee2ad047..038908ba7d 100644 --- a/src/grp-system/libcore/device.c +++ b/src/grp-system/libcore/device.c @@ -22,14 +22,14 @@ #include <libudev.h> -#include "basic/alloc-util.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 "basic/unit-name.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-shared/udev-util.h" #include "dbus-device.h" #include "device.h" diff --git a/src/grp-system/libcore/execute.c b/src/grp-system/libcore/execute.c index b73577817f..183fcba0b3 100644 --- a/src/grp-system/libcore/execute.c +++ b/src/grp-system/libcore/execute.c @@ -52,53 +52,53 @@ #include <systemd/sd-messages.h> -#include "basic/af-list.h" -#include "basic/alloc-util.h" +#include "systemd-basic/af-list.h" +#include "systemd-basic/alloc-util.h" #ifdef HAVE_APPARMOR -#include "shared/apparmor-util.h" +#include "systemd-shared/apparmor-util.h" #endif -#include "basic/async.h" -#include "basic/barrier.h" -#include "basic/cap-list.h" -#include "basic/capability-util.h" -#include "basic/def.h" -#include "basic/env-util.h" -#include "basic/errno-list.h" -#include "basic/exit-status.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/glob-util.h" -#include "basic/io-util.h" -#include "basic/ioprio.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/rlimit-util.h" -#include "basic/rm-rf.h" +#include "systemd-basic/async.h" +#include "systemd-basic/barrier.h" +#include "systemd-basic/cap-list.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/errno-list.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/ioprio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rlimit-util.h" +#include "systemd-basic/rm-rf.h" #include "execute.h" #include "namespace.h" #ifdef HAVE_SECCOMP -#include "shared/seccomp-util.h" +#include "systemd-shared/seccomp-util.h" #endif -#include "basic/securebits.h" -#include "basic/selinux-util.h" -#include "basic/signal-util.h" -#include "basic/smack-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/syslog-util.h" -#include "basic/terminal-util.h" -#include "basic/user-util.h" -#include "basic/util.h" -#include "shared/utmp-wtmp.h" +#include "systemd-basic/securebits.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/smack-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/syslog-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/utmp-wtmp.h" #include "unit.h" diff --git a/src/grp-system/libcore/execute.h b/src/grp-system/libcore/execute.h index cf5e7e4617..178adc00ae 100644 --- a/src/grp-system/libcore/execute.h +++ b/src/grp-system/libcore/execute.h @@ -24,10 +24,10 @@ #include <stdio.h> #include <sys/capability.h> -#include "basic/cgroup-util.h" -#include "basic/list.h" -#include "basic/missing.h" -#include "shared/fdset.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/missing.h" +#include "systemd-shared/fdset.h" typedef struct ExecCommand ExecCommand; typedef struct ExecContext ExecContext; diff --git a/src/grp-system/libcore/failure-action.c b/src/grp-system/libcore/failure-action.c index e22c71dac6..e7d7e4530d 100644 --- a/src/grp-system/libcore/failure-action.c +++ b/src/grp-system/libcore/failure-action.c @@ -22,11 +22,11 @@ #include <linux/reboot.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 "sd-bus/bus-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/terminal-util.h" #include "failure-action.h" diff --git a/src/grp-system/libcore/failure-action.h b/src/grp-system/libcore/failure-action.h index 87b091f46e..47c08f4006 100644 --- a/src/grp-system/libcore/failure-action.h +++ b/src/grp-system/libcore/failure-action.h @@ -32,7 +32,7 @@ typedef enum FailureAction { _FAILURE_ACTION_INVALID = -1 } FailureAction; -#include "basic/macro.h" +#include "systemd-basic/macro.h" #include "manager.h" diff --git a/src/grp-system/libcore/hostname-setup.c b/src/grp-system/libcore/hostname-setup.c index 71e5649952..a85cb8048a 100644 --- a/src/grp-system/libcore/hostname-setup.c +++ b/src/grp-system/libcore/hostname-setup.c @@ -21,13 +21,13 @@ #include <stdio.h> #include <stdlib.h> -#include "basic/alloc-util.h" -#include "basic/fileio.h" -#include "basic/hostname-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "hostname-setup.h" diff --git a/src/grp-system/libcore/ima-setup.c b/src/grp-system/libcore/ima-setup.c index 0b283d95f1..3967e6951a 100644 --- a/src/grp-system/libcore/ima-setup.c +++ b/src/grp-system/libcore/ima-setup.c @@ -22,10 +22,10 @@ #include <errno.h> #include <unistd.h> -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/util.h" #include "ima-setup.h" diff --git a/src/grp-system/libcore/job.c b/src/grp-system/libcore/job.c index 9dc44189e4..803caaf819 100644 --- a/src/grp-system/libcore/job.c +++ b/src/grp-system/libcore/job.c @@ -22,20 +22,20 @@ #include <systemd/sd-id128.h> #include <systemd/sd-messages.h> -#include "basic/alloc-util.h" -#include "basic/async.h" -#include "basic/escape.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/parse-util.h" -#include "basic/set.h" -#include "basic/special.h" -#include "basic/stdio-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/virt.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/async.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/virt.h" #include "dbus-job.h" #include "dbus.h" diff --git a/src/grp-system/libcore/job.h b/src/grp-system/libcore/job.h index f88e5a0782..7338601bb7 100644 --- a/src/grp-system/libcore/job.h +++ b/src/grp-system/libcore/job.h @@ -23,8 +23,8 @@ #include <systemd/sd-event.h> -#include "basic/list.h" -#include "basic/unit-name.h" +#include "systemd-basic/list.h" +#include "systemd-basic/unit-name.h" typedef struct Job Job; typedef struct JobDependency JobDependency; diff --git a/src/grp-system/libcore/kill.c b/src/grp-system/libcore/kill.c index 9f8b45971f..86363bb1c7 100644 --- a/src/grp-system/libcore/kill.c +++ b/src/grp-system/libcore/kill.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/signal-util.h" -#include "basic/string-table.h" -#include "basic/util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/util.h" #include "kill.h" diff --git a/src/grp-system/libcore/kill.h b/src/grp-system/libcore/kill.h index 481ffdf2ff..ad8583b9b0 100644 --- a/src/grp-system/libcore/kill.h +++ b/src/grp-system/libcore/kill.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <stdio.h> -#include "basic/macro.h" +#include "systemd-basic/macro.h" typedef struct KillContext KillContext; diff --git a/src/grp-system/libcore/killall.c b/src/grp-system/libcore/killall.c index 27946f1f84..2841805711 100644 --- a/src/grp-system/libcore/killall.c +++ b/src/grp-system/libcore/killall.c @@ -22,16 +22,16 @@ #include <sys/wait.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/parse-util.h" -#include "basic/process-util.h" -#include "basic/set.h" -#include "basic/string-util.h" -#include "basic/terminal-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" #include "killall.h" diff --git a/src/grp-system/libcore/kmod-setup.c b/src/grp-system/libcore/kmod-setup.c index c91c280e7d..d58a0455d4 100644 --- a/src/grp-system/libcore/kmod-setup.c +++ b/src/grp-system/libcore/kmod-setup.c @@ -24,9 +24,9 @@ #include <libkmod.h> #endif -#include "basic/capability-util.h" -#include "basic/macro.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/macro.h" #include "kmod-setup.h" diff --git a/src/grp-system/libcore/load-dropin.c b/src/grp-system/libcore/load-dropin.c index 9a65b5038b..56d81ed16c 100644 --- a/src/grp-system/libcore/load-dropin.c +++ b/src/grp-system/libcore/load-dropin.c @@ -18,10 +18,10 @@ ***/ -#include "basic/log.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "shared/conf-parser.h" +#include "systemd-basic/log.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-shared/conf-parser.h" #include "load-dropin.h" #include "load-fragment.h" diff --git a/src/grp-system/libcore/load-dropin.h b/src/grp-system/libcore/load-dropin.h index d91cf05197..d007aec604 100644 --- a/src/grp-system/libcore/load-dropin.h +++ b/src/grp-system/libcore/load-dropin.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "shared/dropin.h" +#include "systemd-shared/dropin.h" #include "unit.h" diff --git a/src/grp-system/libcore/load-fragment.c b/src/grp-system/libcore/load-fragment.c index 9a6ffc8bff..83fe2fc420 100644 --- a/src/grp-system/libcore/load-fragment.c +++ b/src/grp-system/libcore/load-fragment.c @@ -31,41 +31,41 @@ #include <sys/resource.h> #include <sys/stat.h> -#include "basic/af-list.h" -#include "basic/alloc-util.h" -#include "basic/cap-list.h" -#include "basic/capability-util.h" -#include "basic/cpu-set-util.h" -#include "basic/env-util.h" -#include "basic/errno-list.h" -#include "basic/escape.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/ioprio.h" -#include "basic/log.h" -#include "basic/missing.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/rlimit-util.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-internal.h" -#include "shared/bus-util.h" -#include "shared/conf-parser.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/af-list.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cap-list.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/cpu-set-util.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/errno-list.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/ioprio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rlimit-util.h" +#include "systemd-shared/conf-parser.h" #include "cgroup.h" #include "load-fragment.h" #ifdef HAVE_SECCOMP -#include "shared/seccomp-util.h" +#include "systemd-shared/seccomp-util.h" #endif -#include "basic/securebits.h" -#include "basic/signal-util.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "basic/utf8.h" -#include "basic/web-util.h" +#include "systemd-basic/securebits.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/web-util.h" #include "unit-printf.h" #include "unit.h" diff --git a/src/grp-system/libcore/locale-setup.c b/src/grp-system/libcore/locale-setup.c index ed50796c09..1794b474b8 100644 --- a/src/grp-system/libcore/locale-setup.c +++ b/src/grp-system/libcore/locale-setup.c @@ -20,13 +20,13 @@ #include <errno.h> #include <stdlib.h> -#include "basic/env-util.h" -#include "basic/fileio.h" -#include "basic/locale-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "basic/virt.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" #include "locale-setup.h" diff --git a/src/grp-system/libcore/loopback-setup.c b/src/grp-system/libcore/loopback-setup.c index f92e346f8c..37bbbc47ec 100644 --- a/src/grp-system/libcore/loopback-setup.c +++ b/src/grp-system/libcore/loopback-setup.c @@ -20,8 +20,8 @@ #include <net/if.h> #include <stdlib.h> -#include "basic/missing.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/missing.h" +#include "systemd-staging/sd-netlink.h" #include "loopback-setup.h" diff --git a/src/grp-system/libcore/machine-id-setup.c b/src/grp-system/libcore/machine-id-setup.c index 0b65583686..f9b6b2d2ed 100644 --- a/src/grp-system/libcore/machine-id-setup.c +++ b/src/grp-system/libcore/machine-id-setup.c @@ -24,21 +24,21 @@ #include <systemd/sd-id128.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/mount-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/umask-util.h" -#include "basic/util.h" -#include "basic/virt.h" #include "sd-id128/id128-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/umask-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" #include "machine-id-setup.h" diff --git a/src/grp-system/libcore/manager.c b/src/grp-system/libcore/manager.c index 26395bc2b3..b8b6cb248e 100644 --- a/src/grp-system/libcore/manager.c +++ b/src/grp-system/libcore/manager.c @@ -39,44 +39,44 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-messages.h> -#include "basic/alloc-util.h" -#include "basic/dirent-util.h" -#include "basic/env-util.h" -#include "basic/escape.h" -#include "basic/exit-status.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/hashmap.h" -#include "basic/io-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/ratelimit.h" -#include "basic/rm-rf.h" -#include "basic/signal-util.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/time-util.h" -#include "basic/umask-util.h" -#include "basic/unit-name.h" -#include "basic/util.h" -#include "basic/virt.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-kernel.h" -#include "shared/boot-timestamps.h" -#include "shared/bus-util.h" -#include "shared/path-lookup.h" -#include "shared/watchdog.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/ratelimit.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/time-util.h" +#include "systemd-basic/umask-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/boot-timestamps.h" +#include "systemd-shared/path-lookup.h" +#include "systemd-shared/watchdog.h" #include "audit-fd.h" #include "dbus-job.h" diff --git a/src/grp-system/libcore/manager.h b/src/grp-system/libcore/manager.h index 252919c27f..ae56cf1a9a 100644 --- a/src/grp-system/libcore/manager.h +++ b/src/grp-system/libcore/manager.h @@ -26,11 +26,11 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "basic/cgroup-util.h" -#include "basic/hashmap.h" -#include "basic/list.h" -#include "basic/ratelimit.h" -#include "shared/fdset.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/list.h" +#include "systemd-basic/ratelimit.h" +#include "systemd-shared/fdset.h" /* Enforce upper limit how many names we allow */ #define MANAGER_MAX_NAMES 131072 /* 128K */ @@ -68,8 +68,8 @@ typedef enum StatusType { STATUS_TYPE_EMERGENCY, } StatusType; -#include "basic/unit-name.h" -#include "shared/path-lookup.h" +#include "systemd-basic/unit-name.h" +#include "systemd-shared/path-lookup.h" #include "execute.h" #include "job.h" diff --git a/src/grp-system/libcore/mount-setup.c b/src/grp-system/libcore/mount-setup.c index 0de1c63b3e..761527dd44 100644 --- a/src/grp-system/libcore/mount-setup.c +++ b/src/grp-system/libcore/mount-setup.c @@ -23,25 +23,25 @@ #include <sys/mount.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/fs-util.h" -#include "basic/label.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/mount-util.h" -#include "basic/path-util.h" -#include "basic/set.h" -#include "basic/smack-util.h" -#include "basic/strv.h" -#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 "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/label.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/smack-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/dev-setup.h" +#include "systemd-shared/efivars.h" #include "mount-setup.h" diff --git a/src/grp-system/libcore/mount.c b/src/grp-system/libcore/mount.c index bc5f29692d..a4bc71caae 100644 --- a/src/grp-system/libcore/mount.c +++ b/src/grp-system/libcore/mount.c @@ -24,22 +24,22 @@ #include <systemd/sd-messages.h> -#include "basic/alloc-util.h" -#include "basic/escape.h" -#include "basic/exit-status.h" -#include "basic/formats-util.h" -#include "basic/log.h" -#include "basic/mkdir.h" -#include "basic/mount-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 "basic/strv.h" -#include "basic/unit-name.h" -#include "shared/fstab-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-shared/fstab-util.h" #include "dbus-mount.h" #include "manager.h" diff --git a/src/grp-system/libcore/namespace.c b/src/grp-system/libcore/namespace.c index f76a0a7fbf..942bae33b3 100644 --- a/src/grp-system/libcore/namespace.c +++ b/src/grp-system/libcore/namespace.c @@ -27,21 +27,21 @@ #include <linux/fs.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/mount-util.h" -#include "basic/path-util.h" -#include "basic/selinux-util.h" -#include "basic/socket-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/umask-util.h" -#include "basic/user-util.h" -#include "basic/util.h" -#include "shared/dev-setup.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/umask-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/dev-setup.h" #include "loopback-setup.h" #include "namespace.h" diff --git a/src/grp-system/libcore/namespace.h b/src/grp-system/libcore/namespace.h index 1ae206efd1..89c6225c39 100644 --- a/src/grp-system/libcore/namespace.h +++ b/src/grp-system/libcore/namespace.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "basic/macro.h" +#include "systemd-basic/macro.h" typedef enum ProtectHome { PROTECT_HOME_NO, diff --git a/src/grp-system/libcore/path.c b/src/grp-system/libcore/path.c index ee1b9a3480..5e4d82c3e4 100644 --- a/src/grp-system/libcore/path.c +++ b/src/grp-system/libcore/path.c @@ -22,18 +22,18 @@ #include <sys/inotify.h> #include <unistd.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 "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 "sd-bus/bus-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" #include "dbus-path.h" #include "path.h" diff --git a/src/grp-system/libcore/scope.c b/src/grp-system/libcore/scope.c index 8998f751f5..aa7d591e66 100644 --- a/src/grp-system/libcore/scope.c +++ b/src/grp-system/libcore/scope.c @@ -20,13 +20,13 @@ #include <errno.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/log.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 "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" #include "dbus-scope.h" #include "load-dropin.h" diff --git a/src/grp-system/libcore/selinux-access.c b/src/grp-system/libcore/selinux-access.c index f6dbfa64b7..6807af86c1 100644 --- a/src/grp-system/libcore/selinux-access.c +++ b/src/grp-system/libcore/selinux-access.c @@ -31,14 +31,14 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/path-util.h" -#include "basic/selinux-util.h" -#include "basic/stdio-util.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" #include "audit-fd.h" diff --git a/src/grp-system/libcore/selinux-access.h b/src/grp-system/libcore/selinux-access.h index 8d91eea38f..687bf07031 100644 --- a/src/grp-system/libcore/selinux-access.h +++ b/src/grp-system/libcore/selinux-access.h @@ -21,7 +21,7 @@ #include <systemd/sd-bus.h> -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" #include "manager.h" diff --git a/src/grp-system/libcore/selinux-setup.c b/src/grp-system/libcore/selinux-setup.c index 08c61af146..0813a7d2ac 100644 --- a/src/grp-system/libcore/selinux-setup.c +++ b/src/grp-system/libcore/selinux-setup.c @@ -25,11 +25,11 @@ #include <selinux/selinux.h> #endif -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/selinux-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "selinux-setup.h" diff --git a/src/grp-system/libcore/service.c b/src/grp-system/libcore/service.c index 43d195bbba..eed6efc758 100644 --- a/src/grp-system/libcore/service.c +++ b/src/grp-system/libcore/service.c @@ -21,31 +21,31 @@ #include <signal.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/async.h" -#include "basic/def.h" -#include "basic/env-util.h" -#include "basic/escape.h" -#include "basic/exit-status.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/log.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.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 "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 "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/async.h" +#include "systemd-basic/def.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" #include "dbus-service.h" #include "load-dropin.h" diff --git a/src/grp-system/libcore/service.h b/src/grp-system/libcore/service.h index 4dcf5ecf78..8670913dbd 100644 --- a/src/grp-system/libcore/service.h +++ b/src/grp-system/libcore/service.h @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/exit-status.h" -#include "basic/ratelimit.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/ratelimit.h" typedef struct Service Service; typedef struct ServiceFDStore ServiceFDStore; diff --git a/src/grp-system/libcore/show-status.c b/src/grp-system/libcore/show-status.c index bb6889630d..16db8a92a7 100644 --- a/src/grp-system/libcore/show-status.c +++ b/src/grp-system/libcore/show-status.c @@ -17,13 +17,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/io-util.h" -#include "basic/parse-util.h" -#include "basic/string-util.h" -#include "basic/terminal-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" #include "show-status.h" diff --git a/src/grp-system/libcore/show-status.h b/src/grp-system/libcore/show-status.h index 56c56eb358..08d6b7f6e1 100644 --- a/src/grp-system/libcore/show-status.h +++ b/src/grp-system/libcore/show-status.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "basic/macro.h" +#include "systemd-basic/macro.h" /* Manager status */ diff --git a/src/grp-system/libcore/slice.c b/src/grp-system/libcore/slice.c index d646b838ac..a96a94e0ac 100644 --- a/src/grp-system/libcore/slice.c +++ b/src/grp-system/libcore/slice.c @@ -19,12 +19,12 @@ #include <errno.h> -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/special.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" #include "dbus-slice.h" #include "slice.h" diff --git a/src/grp-system/libcore/smack-setup.c b/src/grp-system/libcore/smack-setup.c index ab316b69c9..87d2980fbb 100644 --- a/src/grp-system/libcore/smack-setup.c +++ b/src/grp-system/libcore/smack-setup.c @@ -26,14 +26,14 @@ #include <stdlib.h> #include <string.h> -#include "basic/alloc-util.h" -#include "basic/dirent-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "smack-setup.h" diff --git a/src/grp-system/libcore/socket.c b/src/grp-system/libcore/socket.c index 3e0b3e2e49..af3e65ff37 100644 --- a/src/grp-system/libcore/socket.c +++ b/src/grp-system/libcore/socket.c @@ -29,31 +29,31 @@ #include <linux/sctp.h> -#include "basic/alloc-util.h" -#include "basic/copy.h" -#include "basic/def.h" -#include "basic/exit-status.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/io-util.h" -#include "basic/label.h" -#include "basic/log.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/selinux-util.h" -#include "basic/signal-util.h" -#include "basic/smack-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 "basic/user-util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/def.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/label.h" +#include "systemd-basic/log.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/smack-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" #include "dbus-socket.h" #include "socket.h" diff --git a/src/grp-system/libcore/socket.h b/src/grp-system/libcore/socket.h index 232d653fbe..0e3ead5060 100644 --- a/src/grp-system/libcore/socket.h +++ b/src/grp-system/libcore/socket.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/socket-util.h" +#include "systemd-basic/socket-util.h" typedef struct Socket Socket; diff --git a/src/grp-system/libcore/swap.c b/src/grp-system/libcore/swap.c index b787fc15a1..942548fb61 100644 --- a/src/grp-system/libcore/swap.c +++ b/src/grp-system/libcore/swap.c @@ -24,21 +24,21 @@ #include <libudev.h> -#include "basic/alloc-util.h" -#include "basic/escape.h" -#include "basic/exit-status.h" -#include "basic/fd-util.h" -#include "basic/formats-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 "basic/unit-name.h" -#include "basic/virt.h" -#include "shared/fstab-util.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/fstab-util.h" +#include "systemd-shared/udev-util.h" #include "dbus-swap.h" #include "swap.h" diff --git a/src/grp-system/libcore/target.c b/src/grp-system/libcore/target.c index 74af0ced0c..99ed054d0e 100644 --- a/src/grp-system/libcore/target.c +++ b/src/grp-system/libcore/target.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/log.h" -#include "basic/special.h" -#include "basic/string-util.h" -#include "basic/unit-name.h" +#include "systemd-basic/log.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" #include "dbus-target.h" #include "unit.h" diff --git a/src/grp-system/libcore/timer.c b/src/grp-system/libcore/timer.c index 8b9fa71d27..c459999e44 100644 --- a/src/grp-system/libcore/timer.c +++ b/src/grp-system/libcore/timer.c @@ -19,18 +19,18 @@ #include <errno.h> -#include "basic/alloc-util.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 "basic/unit-name.h" -#include "basic/user-util.h" -#include "basic/virt.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/virt.h" #include "dbus-timer.h" #include "timer.h" diff --git a/src/grp-system/libcore/timer.h b/src/grp-system/libcore/timer.h index 710ef126f0..4195423a61 100644 --- a/src/grp-system/libcore/timer.h +++ b/src/grp-system/libcore/timer.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/calendarspec.h" +#include "systemd-basic/calendarspec.h" typedef struct Timer Timer; diff --git a/src/grp-system/libcore/transaction.c b/src/grp-system/libcore/transaction.c index aa57eee556..2768be914f 100644 --- a/src/grp-system/libcore/transaction.c +++ b/src/grp-system/libcore/transaction.c @@ -20,10 +20,10 @@ #include <fcntl.h> #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 "systemd-basic/alloc-util.h" +#include "systemd-basic/terminal-util.h" #include "dbus-unit.h" #include "transaction.h" diff --git a/src/grp-system/libcore/transaction.h b/src/grp-system/libcore/transaction.h index 19d8d3d434..355b7bb6e6 100644 --- a/src/grp-system/libcore/transaction.h +++ b/src/grp-system/libcore/transaction.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/hashmap.h" +#include "systemd-basic/hashmap.h" typedef struct Transaction Transaction; diff --git a/src/grp-system/libcore/unit-printf.c b/src/grp-system/libcore/unit-printf.c index 14c36ab494..4aded4662e 100644 --- a/src/grp-system/libcore/unit-printf.c +++ b/src/grp-system/libcore/unit-printf.c @@ -17,15 +17,15 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/formats-util.h" -#include "basic/macro.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 "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" +#include "systemd-shared/specifier.h" #include "unit-printf.h" #include "unit.h" diff --git a/src/grp-system/libcore/unit.c b/src/grp-system/libcore/unit.c index aff4dbd2ca..3d176e6104 100644 --- a/src/grp-system/libcore/unit.c +++ b/src/grp-system/libcore/unit.c @@ -26,32 +26,32 @@ #include <systemd/sd-id128.h> #include <systemd/sd-messages.h> -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/escape.h" -#include "basic/fileio-label.h" -#include "basic/formats-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/set.h" -#include "basic/signal-util.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/umask-util.h" -#include "basic/unit-name.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 "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fileio-label.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/umask-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/dropin.h" #include "dbus-unit.h" #include "dbus.h" diff --git a/src/grp-system/libcore/unit.h b/src/grp-system/libcore/unit.h index 3e25bfd32a..d57caceb19 100644 --- a/src/grp-system/libcore/unit.h +++ b/src/grp-system/libcore/unit.h @@ -23,10 +23,10 @@ #include <stdlib.h> #include <unistd.h> -#include "basic/list.h" -#include "basic/unit-name.h" -#include "shared/condition.h" -#include "shared/install.h" +#include "systemd-basic/list.h" +#include "systemd-basic/unit-name.h" +#include "systemd-shared/condition.h" +#include "systemd-shared/install.h" typedef struct Unit Unit; typedef struct UnitRef UnitRef; diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c index 0f115db14c..0c7349fc07 100644 --- a/src/grp-system/systemctl/systemctl.c +++ b/src/grp-system/systemctl/systemctl.c @@ -36,56 +36,56 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-login.h> -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/copy.h" -#include "basic/env-util.h" -#include "basic/exit-status.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/glob-util.h" -#include "basic/hostname-util.h" -#include "basic/io-util.h" -#include "basic/list.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/rlimit-util.h" -#include "basic/set.h" -#include "basic/sigbus.h" -#include "basic/signal-util.h" -#include "basic/socket-util.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/unit-name.h" -#include "basic/user-util.h" -#include "basic/util.h" -#include "basic/verbs.h" -#include "basic/virt.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-message.h" -#include "shared/bus-unit-util.h" -#include "shared/bus-util.h" -#include "shared/cgroup-show.h" -#include "shared/dropin.h" -#include "shared/efivars.h" -#include "shared/initreq.h" -#include "shared/install.h" -#include "shared/logs-show.h" -#include "shared/pager.h" -#include "shared/path-lookup.h" -#include "shared/spawn-ask-password-agent.h" -#include "shared/spawn-polkit-agent.h" -#include "shared/utmp-wtmp.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rlimit-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/sigbus.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/verbs.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/bus-unit-util.h" +#include "systemd-shared/cgroup-show.h" +#include "systemd-shared/dropin.h" +#include "systemd-shared/efivars.h" +#include "systemd-shared/initreq.h" +#include "systemd-shared/install.h" +#include "systemd-shared/logs-show.h" +#include "systemd-shared/pager.h" +#include "systemd-shared/path-lookup.h" +#include "systemd-shared/spawn-ask-password-agent.h" +#include "systemd-shared/spawn-polkit-agent.h" +#include "systemd-shared/utmp-wtmp.h" /* The init script exit status codes 0 program is running or service is OK diff --git a/src/grp-system/systemd-shutdown/shutdown.c b/src/grp-system/systemd-shutdown/shutdown.c index 093b6eea87..4517718f8f 100644 --- a/src/grp-system/systemd-shutdown/shutdown.c +++ b/src/grp-system/systemd-shutdown/shutdown.c @@ -30,20 +30,20 @@ #include <linux/reboot.h> -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/def.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/missing.h" -#include "basic/parse-util.h" -#include "basic/process-util.h" -#include "basic/string-util.h" -#include "basic/terminal-util.h" -#include "basic/util.h" -#include "basic/virt.h" -#include "shared/switch-root.h" -#include "shared/watchdog.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/switch-root.h" +#include "systemd-shared/watchdog.h" #include "killall.h" #include "umount.h" diff --git a/src/grp-system/systemd-shutdown/umount.c b/src/grp-system/systemd-shutdown/umount.c index 0079f8ec78..60c7354738 100644 --- a/src/grp-system/systemd-shutdown/umount.c +++ b/src/grp-system/systemd-shutdown/umount.c @@ -28,16 +28,16 @@ #include <libudev.h> -#include "basic/alloc-util.h" -#include "basic/escape.h" -#include "basic/fd-util.h" -#include "basic/list.h" -#include "basic/path-util.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "basic/virt.h" -#include "shared/fstab-util.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/fstab-util.h" +#include "systemd-shared/udev-util.h" #include "mount-setup.h" #include "umount.h" diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c index c558a4b21c..8fafbf4caf 100644 --- a/src/grp-system/systemd/main.c +++ b/src/grp-system/systemd/main.c @@ -38,35 +38,6 @@ #include <systemd/sd-bus.h> #include <systemd/sd-daemon.h> -#include "basic/alloc-util.h" -#include "basic/architecture.h" -#include "basic/build.h" -#include "basic/capability-util.h" -#include "basic/clock-util.h" -#include "basic/cpu-set-util.h" -#include "basic/def.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/log.h" -#include "basic/missing.h" -#include "basic/parse-util.h" -#include "basic/proc-cmdline.h" -#include "basic/process-util.h" -#include "basic/raw-clone.h" -#include "basic/rlimit-util.h" -#include "basic/selinux-util.h" -#include "basic/signal-util.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/stdio-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/umask-util.h" -#include "basic/user-util.h" -#include "basic/virt.h" #include "dbus-manager.h" #include "hostname-setup.h" #include "ima-setup.h" @@ -78,14 +49,43 @@ #include "manager.h" #include "mount-setup.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "selinux-setup.h" -#include "shared/bus-util.h" -#include "shared/conf-parser.h" -#include "shared/fdset.h" -#include "shared/pager.h" -#include "shared/switch-root.h" -#include "shared/watchdog.h" #include "smack-setup.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/architecture.h" +#include "systemd-basic/build.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/clock-util.h" +#include "systemd-basic/cpu-set-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/raw-clone.h" +#include "systemd-basic/rlimit-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/umask-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-shared/fdset.h" +#include "systemd-shared/pager.h" +#include "systemd-shared/switch-root.h" +#include "systemd-shared/watchdog.h" static enum { ACTION_RUN, |