diff options
Diffstat (limited to 'src/libshared/include')
26 files changed, 52 insertions, 52 deletions
diff --git a/src/libshared/include/shared/acl-util.h b/src/libshared/include/shared/acl-util.h index 396e9e067e..af5bcb5b4f 100644 --- a/src/libshared/include/shared/acl-util.h +++ b/src/libshared/include/shared/acl-util.h @@ -25,7 +25,7 @@ #include <stdbool.h> #include <sys/acl.h> -#include "macro.h" +#include "basic/macro.h" int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry); int calc_acl_mask_if_needed(acl_t *acl_p); diff --git a/src/libshared/include/shared/acpi-fpdt.h b/src/libshared/include/shared/acpi-fpdt.h index fc28175d0a..3da32c08ad 100644 --- a/src/libshared/include/shared/acpi-fpdt.h +++ b/src/libshared/include/shared/acpi-fpdt.h @@ -19,6 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <time-util.h> +#include "basic/time-util.h" int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit); diff --git a/src/libshared/include/shared/ask-password-api.h b/src/libshared/include/shared/ask-password-api.h index 9d7f65130c..770ab1f5c0 100644 --- a/src/libshared/include/shared/ask-password-api.h +++ b/src/libshared/include/shared/ask-password-api.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "time-util.h" +#include "basic/time-util.h" typedef enum AskPasswordFlags { ASK_PASSWORD_ACCEPT_CACHED = 1, diff --git a/src/libshared/include/shared/boot-timestamps.h b/src/libshared/include/shared/boot-timestamps.h index 6f691026be..00ea7e3009 100644 --- a/src/libshared/include/shared/boot-timestamps.h +++ b/src/libshared/include/shared/boot-timestamps.h @@ -20,6 +20,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <time-util.h> +#include "basic/time-util.h" int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader); diff --git a/src/libshared/include/shared/bus-unit-util.h b/src/libshared/include/shared/bus-unit-util.h index 8327189a63..e657b42ecb 100644 --- a/src/libshared/include/shared/bus-unit-util.h +++ b/src/libshared/include/shared/bus-unit-util.h @@ -21,8 +21,8 @@ #include <systemd/sd-bus.h> -#include "output-mode.h" -#include "install.h" +#include "shared/output-mode.h" +#include "shared/install.h" typedef struct UnitInfo { const char *machine; diff --git a/src/libshared/include/shared/bus-util.h b/src/libshared/include/shared/bus-util.h index f2b46530ba..73f2ea0749 100644 --- a/src/libshared/include/shared/bus-util.h +++ b/src/libshared/include/shared/bus-util.h @@ -27,9 +27,9 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "hashmap.h" -#include "macro.h" -#include "string-util.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/string-util.h" typedef enum BusTransport { BUS_TRANSPORT_LOCAL, diff --git a/src/libshared/include/shared/cgroup-show.h b/src/libshared/include/shared/cgroup-show.h index 5c1d6e6d98..7deb42fff7 100644 --- a/src/libshared/include/shared/cgroup-show.h +++ b/src/libshared/include/shared/cgroup-show.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <sys/types.h> -#include "logs-show.h" -#include "output-mode.h" +#include "shared/logs-show.h" +#include "shared/output-mode.h" int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, OutputFlags flags); int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns, OutputFlags flags); diff --git a/src/libshared/include/shared/condition.h b/src/libshared/include/shared/condition.h index bdda04b770..fd798460d1 100644 --- a/src/libshared/include/shared/condition.h +++ b/src/libshared/include/shared/condition.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <stdio.h> -#include "list.h" -#include "macro.h" +#include "basic/list.h" +#include "basic/macro.h" typedef enum ConditionType { CONDITION_ARCHITECTURE, diff --git a/src/libshared/include/shared/conf-parser.h b/src/libshared/include/shared/conf-parser.h index f6964e3fd4..f7423d45e7 100644 --- a/src/libshared/include/shared/conf-parser.h +++ b/src/libshared/include/shared/conf-parser.h @@ -25,9 +25,9 @@ #include <stdio.h> #include <syslog.h> -#include "alloc-util.h" -#include "log.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/log.h" +#include "basic/macro.h" /* An abstract parser for simple, line based, shallow configuration * files consisting of variable assignments only. */ diff --git a/src/libshared/include/shared/dns-domain.h b/src/libshared/include/shared/dns-domain.h index af780f0b8b..72e4cb0104 100644 --- a/src/libshared/include/shared/dns-domain.h +++ b/src/libshared/include/shared/dns-domain.h @@ -24,8 +24,8 @@ #include <stddef.h> #include <stdint.h> -#include "hashmap.h" -#include "in-addr-util.h" +#include "basic/hashmap.h" +#include "basic/in-addr-util.h" /* Length of a single label, with all escaping removed, excluding any trailing dot or NUL byte */ #define DNS_LABEL_MAX 63 diff --git a/src/libshared/include/shared/dropin.h b/src/libshared/include/shared/dropin.h index c1936f397b..44235405f6 100644 --- a/src/libshared/include/shared/dropin.h +++ b/src/libshared/include/shared/dropin.h @@ -19,10 +19,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "hashmap.h" -#include "macro.h" -#include "set.h" -#include "unit-name.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/set.h" +#include "basic/unit-name.h" int drop_in_file(const char *dir, const char *unit, unsigned level, const char *name, char **_p, char **_q); diff --git a/src/libshared/include/shared/efivars.h b/src/libshared/include/shared/efivars.h index 243151f922..547b161367 100644 --- a/src/libshared/include/shared/efivars.h +++ b/src/libshared/include/shared/efivars.h @@ -25,7 +25,7 @@ #include <systemd/sd-id128.h> -#include "time-util.h" +#include "basic/time-util.h" #define EFI_VENDOR_LOADER SD_ID128_MAKE(4a,67,b0,82,0a,4c,41,cf,b6,c7,44,0b,29,bb,8c,4f) #define EFI_VENDOR_GLOBAL SD_ID128_MAKE(8b,e4,df,61,93,ca,11,d2,aa,0d,00,e0,98,03,2b,8c) diff --git a/src/libshared/include/shared/fstab-util.h b/src/libshared/include/shared/fstab-util.h index 679f6902f7..3d9e7ab907 100644 --- a/src/libshared/include/shared/fstab-util.h +++ b/src/libshared/include/shared/fstab-util.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <stddef.h> -#include "macro.h" +#include "basic/macro.h" bool fstab_is_mount_point(const char *mount); diff --git a/src/libshared/include/shared/import-util.h b/src/libshared/include/shared/import-util.h index 77b17d91f3..353fa9045c 100644 --- a/src/libshared/include/shared/import-util.h +++ b/src/libshared/include/shared/import-util.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" typedef enum ImportVerify { IMPORT_VERIFY_NO, diff --git a/src/libshared/include/shared/install-printf.h b/src/libshared/include/shared/install-printf.h index 8a570fc265..56099f464d 100644 --- a/src/libshared/include/shared/install-printf.h +++ b/src/libshared/include/shared/install-printf.h @@ -19,6 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "install.h" +#include "shared/install.h" int install_full_printf(UnitFileInstallInfo *i, const char *format, char **ret); diff --git a/src/libshared/include/shared/install.h b/src/libshared/include/shared/install.h index c6aa4f6ef1..2f9b15a1c8 100644 --- a/src/libshared/include/shared/install.h +++ b/src/libshared/include/shared/install.h @@ -30,11 +30,11 @@ typedef struct UnitFileInstallInfo UnitFileInstallInfo; #include <stdbool.h> -#include "hashmap.h" -#include "macro.h" -#include "path-lookup.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "shared/path-lookup.h" +#include "basic/strv.h" +#include "basic/unit-name.h" enum UnitFileScope { UNIT_FILE_SYSTEM, diff --git a/src/libshared/include/shared/logs-show.h b/src/libshared/include/shared/logs-show.h index 15fe5b6e5c..8f3cadd0e3 100644 --- a/src/libshared/include/shared/logs-show.h +++ b/src/libshared/include/shared/logs-show.h @@ -26,10 +26,10 @@ #include <systemd/sd-journal.h> -#include "macro.h" -#include "output-mode.h" -#include "time-util.h" -#include "util.h" +#include "basic/macro.h" +#include "shared/output-mode.h" +#include "basic/time-util.h" +#include "basic/util.h" int output_journal( FILE *f, diff --git a/src/libshared/include/shared/machine-image.h b/src/libshared/include/shared/machine-image.h index 7410168c4f..30a005e114 100644 --- a/src/libshared/include/shared/machine-image.h +++ b/src/libshared/include/shared/machine-image.h @@ -22,12 +22,12 @@ #include <stdbool.h> #include <stdint.h> -#include "hashmap.h" -#include "lockfile-util.h" -#include "macro.h" -#include "path-util.h" -#include "string-util.h" -#include "time-util.h" +#include "basic/hashmap.h" +#include "basic/lockfile-util.h" +#include "basic/macro.h" +#include "basic/path-util.h" +#include "basic/string-util.h" +#include "basic/time-util.h" typedef enum ImageType { IMAGE_DIRECTORY, diff --git a/src/libshared/include/shared/output-mode.h b/src/libshared/include/shared/output-mode.h index f37189e57f..9a8d8127d3 100644 --- a/src/libshared/include/shared/output-mode.h +++ b/src/libshared/include/shared/output-mode.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "macro.h" +#include "basic/macro.h" typedef enum OutputMode { OUTPUT_SHORT, diff --git a/src/libshared/include/shared/pager.h b/src/libshared/include/shared/pager.h index 893e1d2bb6..2a3cbe1721 100644 --- a/src/libshared/include/shared/pager.h +++ b/src/libshared/include/shared/pager.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" int pager_open(bool no_pager, bool jump_to_end); void pager_close(void); diff --git a/src/libshared/include/shared/path-lookup.h b/src/libshared/include/shared/path-lookup.h index f9bb2fe237..c3e0a10552 100644 --- a/src/libshared/include/shared/path-lookup.h +++ b/src/libshared/include/shared/path-lookup.h @@ -23,8 +23,8 @@ typedef struct LookupPaths LookupPaths; -#include "install.h" -#include "macro.h" +#include "shared/install.h" +#include "basic/macro.h" typedef enum LookupPathsFlags { LOOKUP_PATHS_EXCLUDE_GENERATED = 1, diff --git a/src/libshared/include/shared/ptyfwd.h b/src/libshared/include/shared/ptyfwd.h index 83c1f60970..8f32184433 100644 --- a/src/libshared/include/shared/ptyfwd.h +++ b/src/libshared/include/shared/ptyfwd.h @@ -23,7 +23,7 @@ #include <systemd/sd-event.h> -#include "macro.h" +#include "basic/macro.h" typedef struct PTYForward PTYForward; diff --git a/src/libshared/include/shared/resolve-util.h b/src/libshared/include/shared/resolve-util.h index 8636a6c134..8df46599ad 100644 --- a/src/libshared/include/shared/resolve-util.h +++ b/src/libshared/include/shared/resolve-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "macro.h" +#include "basic/macro.h" typedef enum ResolveSupport ResolveSupport; typedef enum DnssecMode DnssecMode; diff --git a/src/libshared/include/shared/udev-util.h b/src/libshared/include/shared/udev-util.h index ca0889f8a6..7765918a12 100644 --- a/src/libshared/include/shared/udev-util.h +++ b/src/libshared/include/shared/udev-util.h @@ -20,7 +20,7 @@ ***/ #include "udev.h" -#include "util.h" +#include "basic/util.h" DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_device*, udev_device_unref); diff --git a/src/libshared/include/shared/utmp-wtmp.h b/src/libshared/include/shared/utmp-wtmp.h index 438e270a26..50dde37b16 100644 --- a/src/libshared/include/shared/utmp-wtmp.h +++ b/src/libshared/include/shared/utmp-wtmp.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <sys/types.h> -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" #ifdef HAVE_UTMP int utmp_get_runlevel(int *runlevel, int *previous); diff --git a/src/libshared/include/shared/watchdog.h b/src/libshared/include/shared/watchdog.h index f6ec178ea1..78e1406f5d 100644 --- a/src/libshared/include/shared/watchdog.h +++ b/src/libshared/include/shared/watchdog.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" int watchdog_set_timeout(usec_t *usec); int watchdog_ping(void); |