From e1a4c5422deec7970cc5ce0154fd4fc721ee8dc2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 28 Jul 2016 00:24:41 -0400 Subject: fix --- src/grp-login/liblogind-core/logind-acl.c | 4 ++-- src/grp-login/liblogind-core/logind-action.c | 6 +++--- src/grp-login/liblogind-core/logind-core.c | 4 ++-- src/grp-login/liblogind-core/logind-dbus.c | 10 +++++----- src/grp-login/liblogind-core/logind-gperf.gperf | 2 +- src/grp-login/liblogind-core/logind-seat-dbus.c | 2 +- src/grp-login/liblogind-core/logind-session-dbus.c | 2 +- src/grp-login/liblogind-core/logind-session-device.c | 2 +- src/grp-login/liblogind-core/logind-session.c | 2 +- src/grp-login/liblogind-core/logind-user-dbus.c | 2 +- src/grp-login/liblogind-core/logind-user.c | 6 +++--- src/grp-login/liblogind-core/logind-utmp.c | 4 ++-- src/grp-login/loginctl/loginctl.c | 12 ++++++------ src/grp-login/loginctl/sysfs-show.c | 2 +- src/grp-login/pam_systemd/pam_systemd.c | 2 +- src/grp-login/systemd-inhibit/inhibit.c | 2 +- src/grp-login/systemd-logind/logind.c | 6 +++--- src/grp-login/test-inhibit.c | 2 +- src/grp-login/test-login-tables.c | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src/grp-login') diff --git a/src/grp-login/liblogind-core/logind-acl.c b/src/grp-login/liblogind-core/logind-acl.c index 03a6c1059b..9f6199e6eb 100644 --- a/src/grp-login/liblogind-core/logind-acl.c +++ b/src/grp-login/liblogind-core/logind-acl.c @@ -20,7 +20,7 @@ #include #include -#include "acl-util.h" +#include "shared/acl-util.h" #include "basic/alloc-util.h" #include "basic/dirent-util.h" #include "basic/escape.h" @@ -29,7 +29,7 @@ #include "logind-acl.h" #include "basic/set.h" #include "basic/string-util.h" -#include "udev-util.h" +#include "shared/udev-util.h" #include "basic/util.h" static int flush_acl(acl_t acl) { diff --git a/src/grp-login/liblogind-core/logind-action.c b/src/grp-login/liblogind-core/logind-action.c index 884957dcf4..6976377c0a 100644 --- a/src/grp-login/liblogind-core/logind-action.c +++ b/src/grp-login/liblogind-core/logind-action.c @@ -21,12 +21,12 @@ #include "basic/alloc-util.h" #include "bus-error.h" -#include "bus-util.h" -#include "conf-parser.h" +#include "shared/bus-util.h" +#include "shared/conf-parser.h" #include "basic/formats-util.h" #include "logind-action.h" #include "basic/process-util.h" -#include "sleep-config.h" +#include "shared/sleep-config.h" #include "basic/special.h" #include "basic/string-table.h" #include "basic/terminal-util.h" diff --git a/src/grp-login/liblogind-core/logind-core.c b/src/grp-login/liblogind-core/logind-core.c index 901dfcbbaf..e47677ffda 100644 --- a/src/grp-login/liblogind-core/logind-core.c +++ b/src/grp-login/liblogind-core/logind-core.c @@ -25,13 +25,13 @@ #include "basic/alloc-util.h" #include "bus-error.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/cgroup-util.h" #include "basic/fd-util.h" #include "logind.h" #include "basic/strv.h" #include "basic/terminal-util.h" -#include "udev-util.h" +#include "shared/udev-util.h" #include "basic/user-util.h" int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device) { diff --git a/src/grp-login/liblogind-core/logind-dbus.c b/src/grp-login/liblogind-core/logind-dbus.c index cd03d80ffa..bc705e1754 100644 --- a/src/grp-login/liblogind-core/logind-dbus.c +++ b/src/grp-login/liblogind-core/logind-dbus.c @@ -28,9 +28,9 @@ #include "basic/audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/dirent-util.h" -#include "efivars.h" +#include "shared/efivars.h" #include "basic/escape.h" #include "basic/fd-util.h" #include "basic/fileio-label.h" @@ -41,14 +41,14 @@ #include "basic/path-util.h" #include "basic/process-util.h" #include "basic/selinux-util.h" -#include "sleep-config.h" +#include "shared/sleep-config.h" #include "basic/special.h" #include "basic/strv.h" #include "basic/terminal-util.h" -#include "udev-util.h" +#include "shared/udev-util.h" #include "basic/unit-name.h" #include "basic/user-util.h" -#include "utmp-wtmp.h" +#include "shared/utmp-wtmp.h" int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret) { _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; diff --git a/src/grp-login/liblogind-core/logind-gperf.gperf b/src/grp-login/liblogind-core/logind-gperf.gperf index 6bd08adc05..6d5c484439 100644 --- a/src/grp-login/liblogind-core/logind-gperf.gperf +++ b/src/grp-login/liblogind-core/logind-gperf.gperf @@ -1,6 +1,6 @@ %{ #include -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "logind.h" %} struct ConfigPerfItem; diff --git a/src/grp-login/liblogind-core/logind-seat-dbus.c b/src/grp-login/liblogind-core/logind-seat-dbus.c index 63286b6733..bd9c4d1c06 100644 --- a/src/grp-login/liblogind-core/logind-seat-dbus.c +++ b/src/grp-login/liblogind-core/logind-seat-dbus.c @@ -23,7 +23,7 @@ #include "basic/alloc-util.h" #include "bus-common-errors.h" #include "basic/bus-label.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "logind-seat.h" #include "logind.h" #include "basic/strv.h" diff --git a/src/grp-login/liblogind-core/logind-session-dbus.c b/src/grp-login/liblogind-core/logind-session-dbus.c index c0a6b10d6c..483bf0de52 100644 --- a/src/grp-login/liblogind-core/logind-session-dbus.c +++ b/src/grp-login/liblogind-core/logind-session-dbus.c @@ -23,7 +23,7 @@ #include "basic/alloc-util.h" #include "bus-common-errors.h" #include "basic/bus-label.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "logind-session-device.h" #include "logind-session.h" diff --git a/src/grp-login/liblogind-core/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c index ae7ffc6e90..517a2fcb8e 100644 --- a/src/grp-login/liblogind-core/logind-session-device.c +++ b/src/grp-login/liblogind-core/logind-session-device.c @@ -26,7 +26,7 @@ #include "libudev.h" #include "basic/alloc-util.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "logind-session-device.h" #include "basic/missing.h" diff --git a/src/grp-login/liblogind-core/logind-session.c b/src/grp-login/liblogind-core/logind-session.c index 176dd5d8ff..b38e47e7e9 100644 --- a/src/grp-login/liblogind-core/logind-session.c +++ b/src/grp-login/liblogind-core/logind-session.c @@ -31,7 +31,7 @@ #include "basic/alloc-util.h" #include "basic/audit-util.h" #include "bus-error.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/escape.h" #include "basic/fd-util.h" #include "basic/fileio.h" diff --git a/src/grp-login/liblogind-core/logind-user-dbus.c b/src/grp-login/liblogind-core/logind-user-dbus.c index 66f470472e..b09ecf05b4 100644 --- a/src/grp-login/liblogind-core/logind-user-dbus.c +++ b/src/grp-login/liblogind-core/logind-user-dbus.c @@ -21,7 +21,7 @@ #include #include "basic/alloc-util.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/formats-util.h" #include "logind-user.h" #include "logind.h" diff --git a/src/grp-login/liblogind-core/logind-user.c b/src/grp-login/liblogind-core/logind-user.c index 6b88d9296e..4d7d8b1133 100644 --- a/src/grp-login/liblogind-core/logind-user.c +++ b/src/grp-login/liblogind-core/logind-user.c @@ -25,9 +25,9 @@ #include "basic/alloc-util.h" #include "bus-common-errors.h" #include "bus-error.h" -#include "bus-util.h" -#include "clean-ipc.h" -#include "conf-parser.h" +#include "shared/bus-util.h" +#include "shared/clean-ipc.h" +#include "shared/conf-parser.h" #include "basic/escape.h" #include "basic/fd-util.h" #include "basic/fileio.h" diff --git a/src/grp-login/liblogind-core/logind-utmp.c b/src/grp-login/liblogind-core/logind-utmp.c index 526e606744..04ade6684b 100644 --- a/src/grp-login/liblogind-core/logind-utmp.c +++ b/src/grp-login/liblogind-core/logind-utmp.c @@ -28,14 +28,14 @@ #include "basic/audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/formats-util.h" #include "logind.h" #include "basic/special.h" #include "basic/strv.h" #include "basic/unit-name.h" #include "basic/user-util.h" -#include "utmp-wtmp.h" +#include "shared/utmp-wtmp.h" _const_ static usec_t when_wall(usec_t n, usec_t elapse) { diff --git a/src/grp-login/loginctl/loginctl.c b/src/grp-login/loginctl/loginctl.c index 582a0fd011..af747d2344 100644 --- a/src/grp-login/loginctl/loginctl.c +++ b/src/grp-login/loginctl/loginctl.c @@ -27,18 +27,18 @@ #include "basic/alloc-util.h" #include "bus-error.h" -#include "bus-unit-util.h" -#include "bus-util.h" -#include "cgroup-show.h" +#include "shared/bus-unit-util.h" +#include "shared/bus-util.h" +#include "shared/cgroup-show.h" #include "basic/cgroup-util.h" #include "basic/log.h" -#include "logs-show.h" +#include "shared/logs-show.h" #include "basic/macro.h" -#include "pager.h" +#include "shared/pager.h" #include "basic/parse-util.h" #include "basic/process-util.h" #include "basic/signal-util.h" -#include "spawn-polkit-agent.h" +#include "shared/spawn-polkit-agent.h" #include "basic/strv.h" #include "sysfs-show.h" #include "basic/terminal-util.h" diff --git a/src/grp-login/loginctl/sysfs-show.c b/src/grp-login/loginctl/sysfs-show.c index 42b4c08046..c56c919168 100644 --- a/src/grp-login/loginctl/sysfs-show.c +++ b/src/grp-login/loginctl/sysfs-show.c @@ -28,7 +28,7 @@ #include "basic/string-util.h" #include "sysfs-show.h" #include "basic/terminal-util.h" -#include "udev-util.h" +#include "shared/udev-util.h" #include "basic/util.h" static int show_sysfs_one( diff --git a/src/grp-login/pam_systemd/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c index 4dfd12be42..b50fa50697 100644 --- a/src/grp-login/pam_systemd/pam_systemd.c +++ b/src/grp-login/pam_systemd/pam_systemd.c @@ -32,7 +32,7 @@ #include "basic/audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/def.h" #include "basic/fd-util.h" #include "basic/fileio.h" diff --git a/src/grp-login/systemd-inhibit/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c index ea11b2a0e7..89f116f1b5 100644 --- a/src/grp-login/systemd-inhibit/inhibit.c +++ b/src/grp-login/systemd-inhibit/inhibit.c @@ -27,7 +27,7 @@ #include "basic/alloc-util.h" #include "bus-error.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/formats-util.h" #include "basic/process-util.h" diff --git a/src/grp-login/systemd-logind/logind.c b/src/grp-login/systemd-logind/logind.c index 6bc8cc907a..8031d04a8f 100644 --- a/src/grp-login/systemd-logind/logind.c +++ b/src/grp-login/systemd-logind/logind.c @@ -27,8 +27,8 @@ #include "basic/alloc-util.h" #include "bus-error.h" -#include "bus-util.h" -#include "conf-parser.h" +#include "shared/bus-util.h" +#include "shared/conf-parser.h" #include "basic/def.h" #include "basic/dirent-util.h" #include "basic/fd-util.h" @@ -37,7 +37,7 @@ #include "basic/selinux-util.h" #include "basic/signal-util.h" #include "basic/strv.h" -#include "udev-util.h" +#include "shared/udev-util.h" static void manager_free(Manager *m); diff --git a/src/grp-login/test-inhibit.c b/src/grp-login/test-inhibit.c index 07ece2f5bb..b186b36ce1 100644 --- a/src/grp-login/test-inhibit.c +++ b/src/grp-login/test-inhibit.c @@ -21,7 +21,7 @@ #include -#include "bus-util.h" +#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/macro.h" #include "basic/util.h" diff --git a/src/grp-login/test-login-tables.c b/src/grp-login/test-login-tables.c index 4fbc893a9a..3f2f4f3054 100644 --- a/src/grp-login/test-login-tables.c +++ b/src/grp-login/test-login-tables.c @@ -19,7 +19,7 @@ #include "logind-action.h" #include "logind-session.h" -#include "test-tables.h" +#include "shared/test-tables.h" int main(int argc, char **argv) { test_table(handle_action, HANDLE_ACTION); -- cgit v1.2.3-54-g00ecf