diff options
Diffstat (limited to 'src/libbasic/include/basic')
63 files changed, 113 insertions, 111 deletions
diff --git a/src/libbasic/include/basic/af-list.h b/src/libbasic/include/basic/af-list.h index da9d373872..6a4cc03839 100644 --- a/src/libbasic/include/basic/af-list.h +++ b/src/libbasic/include/basic/af-list.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/string-util.h" +#include "string-util.h" const char *af_to_name(int id); int af_from_name(const char *name); diff --git a/src/libbasic/include/basic/alloc-util.h b/src/libbasic/include/basic/alloc-util.h index e17c027634..ceeee519b7 100644 --- a/src/libbasic/include/basic/alloc-util.h +++ b/src/libbasic/include/basic/alloc-util.h @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include "basic/macro.h" +#include "macro.h" #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) diff --git a/src/libbasic/include/basic/architecture.h b/src/libbasic/include/basic/architecture.h index 2d4f710f71..b3e4d85906 100644 --- a/src/libbasic/include/basic/architecture.h +++ b/src/libbasic/include/basic/architecture.h @@ -21,8 +21,8 @@ #include <endian.h> -#include "basic/macro.h" -#include "basic/util.h" +#include "macro.h" +#include "util.h" /* A cleaned up architecture definition. We don't want to get lost in * processor features, models, generations or even ABIs. Hence we diff --git a/src/libbasic/include/basic/barrier.h b/src/libbasic/include/basic/barrier.h index a27a8fc7d6..6347fddc4d 100644 --- a/src/libbasic/include/basic/barrier.h +++ b/src/libbasic/include/basic/barrier.h @@ -23,7 +23,7 @@ #include <stdint.h> #include <sys/types.h> -#include "basic/macro.h" +#include "macro.h" /* See source file for an API description. */ diff --git a/src/libbasic/include/basic/bitmap.h b/src/libbasic/include/basic/bitmap.h index ee0e13de9e..f5f8f2f018 100644 --- a/src/libbasic/include/basic/bitmap.h +++ b/src/libbasic/include/basic/bitmap.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "basic/hashmap.h" -#include "basic/macro.h" +#include "hashmap.h" +#include "macro.h" typedef struct Bitmap Bitmap; diff --git a/src/libbasic/include/basic/blkid-util.h b/src/libbasic/include/basic/blkid-util.h index 69a941ede2..7aa75eb091 100644 --- a/src/libbasic/include/basic/blkid-util.h +++ b/src/libbasic/include/basic/blkid-util.h @@ -23,7 +23,7 @@ #include <blkid/blkid.h> #endif -#include "basic/util.h" +#include "util.h" #ifdef HAVE_BLKID DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe); diff --git a/src/libbasic/include/basic/btrfs-ctree.h b/src/libbasic/include/basic/btrfs-ctree.h index f35bfbc7f4..66bdf9736e 100644 --- a/src/libbasic/include/basic/btrfs-ctree.h +++ b/src/libbasic/include/basic/btrfs-ctree.h @@ -1,7 +1,7 @@ #pragma once -#include "basic/macro.h" -#include "basic/sparse-endian.h" +#include "macro.h" +#include "sparse-endian.h" /* Stolen from btrfs' ctree.h */ diff --git a/src/libbasic/include/basic/btrfs-util.h b/src/libbasic/include/basic/btrfs-util.h index 6221089f3a..db431f5b74 100644 --- a/src/libbasic/include/basic/btrfs-util.h +++ b/src/libbasic/include/basic/btrfs-util.h @@ -25,7 +25,7 @@ #include <systemd/sd-id128.h> -#include "basic/time-util.h" +#include "time-util.h" typedef struct BtrfsSubvolInfo { uint64_t subvol_id; diff --git a/src/libbasic/include/basic/calendarspec.h b/src/libbasic/include/basic/calendarspec.h index 8456afe499..f6472c1244 100644 --- a/src/libbasic/include/basic/calendarspec.h +++ b/src/libbasic/include/basic/calendarspec.h @@ -24,8 +24,8 @@ #include <stdbool.h> -#include "basic/time-util.h" -#include "basic/util.h" +#include "time-util.h" +#include "util.h" typedef struct CalendarComponent { int value; diff --git a/src/libbasic/include/basic/capability-util.h b/src/libbasic/include/basic/capability-util.h index 2486cd8eb4..35a896e229 100644 --- a/src/libbasic/include/basic/capability-util.h +++ b/src/libbasic/include/basic/capability-util.h @@ -24,8 +24,8 @@ #include <sys/capability.h> #include <sys/types.h> -#include "basic/macro.h" -#include "basic/util.h" +#include "macro.h" +#include "util.h" #define CAP_ALL (uint64_t) -1 diff --git a/src/libbasic/include/basic/cgroup-util.h b/src/libbasic/include/basic/cgroup-util.h index f957b181a5..4bb5291296 100644 --- a/src/libbasic/include/basic/cgroup-util.h +++ b/src/libbasic/include/basic/cgroup-util.h @@ -25,10 +25,10 @@ #include <stdio.h> #include <sys/types.h> -#include "basic/def.h" -#include "basic/hashmap.h" -#include "basic/macro.h" -#include "basic/set.h" +#include "def.h" +#include "hashmap.h" +#include "macro.h" +#include "set.h" /* An enum of well known cgroup controllers */ typedef enum CGroupController { diff --git a/src/libbasic/include/basic/cpu-set-util.h b/src/libbasic/include/basic/cpu-set-util.h index 17cafff2ae..6f49d9afb0 100644 --- a/src/libbasic/include/basic/cpu-set-util.h +++ b/src/libbasic/include/basic/cpu-set-util.h @@ -22,7 +22,7 @@ #include <sched.h> -#include "basic/macro.h" +#include "macro.h" DEFINE_TRIVIAL_CLEANUP_FUNC(cpu_set_t*, CPU_FREE); #define _cleanup_cpu_free_ _cleanup_(CPU_FREEp) diff --git a/src/libbasic/include/basic/def.h b/src/libbasic/include/basic/def.h index c9151e6023..1a7a0f4928 100644 --- a/src/libbasic/include/basic/def.h +++ b/src/libbasic/include/basic/def.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/util.h" +#include "util.h" #define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC) #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC) diff --git a/src/libbasic/include/basic/dirent-util.h b/src/libbasic/include/basic/dirent-util.h index 4352db66c5..b91d04908f 100644 --- a/src/libbasic/include/basic/dirent-util.h +++ b/src/libbasic/include/basic/dirent-util.h @@ -23,8 +23,8 @@ #include <errno.h> #include <stdbool.h> -#include "basic/macro.h" -#include "basic/path-util.h" +#include "macro.h" +#include "path-util.h" int dirent_ensure_type(DIR *d, struct dirent *de); diff --git a/src/libbasic/include/basic/env-util.h b/src/libbasic/include/basic/env-util.h index f22958257d..b1fef704c2 100644 --- a/src/libbasic/include/basic/env-util.h +++ b/src/libbasic/include/basic/env-util.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <stddef.h> -#include "basic/macro.h" +#include "macro.h" bool env_name_is_valid(const char *e); bool env_value_is_valid(const char *e); diff --git a/src/libbasic/include/basic/escape.h b/src/libbasic/include/basic/escape.h index 97fa90caf0..6e58f61e19 100644 --- a/src/libbasic/include/basic/escape.h +++ b/src/libbasic/include/basic/escape.h @@ -25,8 +25,8 @@ #include <sys/types.h> #include <uchar.h> -#include "basic/missing.h" -#include "basic/string-util.h" +#include "missing.h" +#include "string-util.h" /* What characters are special in the shell? */ /* must be escaped outside and inside double-quotes */ diff --git a/src/libbasic/include/basic/exit-status.h b/src/libbasic/include/basic/exit-status.h index 3e9dcb1e53..1208c8feed 100644 --- a/src/libbasic/include/basic/exit-status.h +++ b/src/libbasic/include/basic/exit-status.h @@ -21,9 +21,9 @@ #include <stdbool.h> -#include "basic/hashmap.h" -#include "basic/macro.h" -#include "basic/set.h" +#include "hashmap.h" +#include "macro.h" +#include "set.h" typedef enum ExitStatus { /* EXIT_SUCCESS defined by libc */ diff --git a/src/libbasic/include/basic/extract-word.h b/src/libbasic/include/basic/extract-word.h index 6211a7d15b..21db5ef33f 100644 --- a/src/libbasic/include/basic/extract-word.h +++ b/src/libbasic/include/basic/extract-word.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/macro.h" +#include "macro.h" typedef enum ExtractFlags { EXTRACT_RELAX = 1, diff --git a/src/libbasic/include/basic/fd-util.h b/src/libbasic/include/basic/fd-util.h index 706c49324c..b86e41698a 100644 --- a/src/libbasic/include/basic/fd-util.h +++ b/src/libbasic/include/basic/fd-util.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <sys/socket.h> -#include "basic/macro.h" +#include "macro.h" /* Make sure we can distinguish fd 0 and NULL */ #define FD_TO_PTR(fd) INT_TO_PTR((fd)+1) diff --git a/src/libbasic/include/basic/fdset.h b/src/libbasic/include/basic/fdset.h index 3ff5d519af..16efe5bdf2 100644 --- a/src/libbasic/include/basic/fdset.h +++ b/src/libbasic/include/basic/fdset.h @@ -21,9 +21,9 @@ #include <stdbool.h> -#include "basic/hashmap.h" -#include "basic/macro.h" -#include "basic/set.h" +#include "hashmap.h" +#include "macro.h" +#include "set.h" typedef struct FDSet FDSet; diff --git a/src/libbasic/include/basic/fileio-label.h b/src/libbasic/include/basic/fileio-label.h index e8e8375de6..fe7543013d 100644 --- a/src/libbasic/include/basic/fileio-label.h +++ b/src/libbasic/include/basic/fileio-label.h @@ -22,7 +22,7 @@ #include <stdio.h> -#include "basic/fileio.h" +#include "fileio.h" int write_string_file_atomic_label(const char *fn, const char *line); int write_env_file_label(const char *fname, char **l); diff --git a/src/libbasic/include/basic/fileio.h b/src/libbasic/include/basic/fileio.h index 31f75d0f97..58dbc80c24 100644 --- a/src/libbasic/include/basic/fileio.h +++ b/src/libbasic/include/basic/fileio.h @@ -25,8 +25,8 @@ #include <stdio.h> #include <sys/types.h> -#include "basic/macro.h" -#include "basic/time-util.h" +#include "macro.h" +#include "time-util.h" typedef enum { WRITE_STRING_FILE_CREATE = 1, diff --git a/src/libbasic/include/basic/fs-util.h b/src/libbasic/include/basic/fs-util.h index 69292a3b22..517b599d6f 100644 --- a/src/libbasic/include/basic/fs-util.h +++ b/src/libbasic/include/basic/fs-util.h @@ -27,7 +27,7 @@ #include <sys/types.h> #include <unistd.h> -#include "basic/time-util.h" +#include "time-util.h" int unlink_noerrno(const char *path); diff --git a/src/libbasic/include/basic/glob-util.h b/src/libbasic/include/basic/glob-util.h index 63daf4d67f..5d8fb47a26 100644 --- a/src/libbasic/include/basic/glob-util.h +++ b/src/libbasic/include/basic/glob-util.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <string.h> -#include "basic/macro.h" -#include "basic/string-util.h" +#include "macro.h" +#include "string-util.h" int glob_exists(const char *path); int glob_extend(char ***strv, const char *path); diff --git a/src/libbasic/include/basic/hash-funcs.h b/src/libbasic/include/basic/hash-funcs.h index 95c565a3ce..299189d143 100644 --- a/src/libbasic/include/basic/hash-funcs.h +++ b/src/libbasic/include/basic/hash-funcs.h @@ -20,8 +20,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/macro.h" -#include "basic/siphash24.h" +#include "macro.h" +#include "siphash24.h" typedef void (*hash_func_t)(const void *p, struct siphash *state); typedef int (*compare_func_t)(const void *a, const void *b); diff --git a/src/libbasic/include/basic/hashmap.h b/src/libbasic/include/basic/hashmap.h index 2be0e99d42..6d1ae48b21 100644 --- a/src/libbasic/include/basic/hashmap.h +++ b/src/libbasic/include/basic/hashmap.h @@ -24,9 +24,9 @@ #include <stdbool.h> #include <stddef.h> -#include "basic/hash-funcs.h" -#include "basic/macro.h" -#include "basic/util.h" +#include "hash-funcs.h" +#include "macro.h" +#include "util.h" /* * A hash table implementation. As a minor optimization a NULL hashmap object diff --git a/src/libbasic/include/basic/hexdecoct.h b/src/libbasic/include/basic/hexdecoct.h index 3c1225cf8b..1ba2f69ebd 100644 --- a/src/libbasic/include/basic/hexdecoct.h +++ b/src/libbasic/include/basic/hexdecoct.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <sys/types.h> -#include "basic/macro.h" +#include "macro.h" char octchar(int x) _const_; int unoctchar(char c) _const_; diff --git a/src/libbasic/include/basic/hostname-util.h b/src/libbasic/include/basic/hostname-util.h index e23412e116..7af4e6c7ec 100644 --- a/src/libbasic/include/basic/hostname-util.h +++ b/src/libbasic/include/basic/hostname-util.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "basic/macro.h" +#include "macro.h" bool hostname_is_set(void); diff --git a/src/libbasic/include/basic/in-addr-util.h b/src/libbasic/include/basic/in-addr-util.h index c28a84a0d9..17798ce816 100644 --- a/src/libbasic/include/basic/in-addr-util.h +++ b/src/libbasic/include/basic/in-addr-util.h @@ -23,8 +23,8 @@ #include <stddef.h> #include <sys/socket.h> -#include "basic/macro.h" -#include "basic/util.h" +#include "macro.h" +#include "util.h" union in_addr_union { struct in_addr in; diff --git a/src/libbasic/include/basic/io-util.h b/src/libbasic/include/basic/io-util.h index 100f15c283..4684ed3bfc 100644 --- a/src/libbasic/include/basic/io-util.h +++ b/src/libbasic/include/basic/io-util.h @@ -25,8 +25,8 @@ #include <sys/types.h> #include <sys/uio.h> -#include "basic/macro.h" -#include "basic/time-util.h" +#include "macro.h" +#include "time-util.h" int flush_fd(int fd); diff --git a/src/libbasic/include/basic/locale-util.h b/src/libbasic/include/basic/locale-util.h index e5db878b12..0630a034ab 100644 --- a/src/libbasic/include/basic/locale-util.h +++ b/src/libbasic/include/basic/locale-util.h @@ -22,7 +22,7 @@ #include <libintl.h> #include <stdbool.h> -#include "basic/macro.h" +#include "macro.h" typedef enum LocaleVariable { /* We don't list LC_ALL here on purpose. People should be diff --git a/src/libbasic/include/basic/lockfile-util.h b/src/libbasic/include/basic/lockfile-util.h index e344e1f8f1..22491ee8e1 100644 --- a/src/libbasic/include/basic/lockfile-util.h +++ b/src/libbasic/include/basic/lockfile-util.h @@ -21,8 +21,8 @@ #include <stddef.h> -#include "basic/macro.h" -#include "basic/missing.h" +#include "macro.h" +#include "missing.h" typedef struct LockFile { char *path; diff --git a/src/libbasic/include/basic/log.h b/src/libbasic/include/basic/log.h index 6ddbac1436..d2a22b5829 100644 --- a/src/libbasic/include/basic/log.h +++ b/src/libbasic/include/basic/log.h @@ -29,7 +29,7 @@ #include <systemd/sd-id128.h> -#include "basic/macro.h" +#include "macro.h" typedef enum LogTarget{ LOG_TARGET_CONSOLE, diff --git a/src/libbasic/include/basic/macro.h b/src/libbasic/include/basic/macro.h index e83d2f77d2..e41aa4260f 100644 --- a/src/libbasic/include/basic/macro.h +++ b/src/libbasic/include/basic/macro.h @@ -403,4 +403,4 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { } \ struct __useless_struct_to_allow_trailing_semicolon__ -#include "basic/log.h" +#include "log.h" diff --git a/src/libbasic/include/basic/missing.h b/src/libbasic/include/basic/missing.h index 13c9b89080..168d8cdb0a 100644 --- a/src/libbasic/include/basic/missing.h +++ b/src/libbasic/include/basic/missing.h @@ -23,6 +23,13 @@ #include <errno.h> #include <fcntl.h> +#include <net/ethernet.h> +#include <stdlib.h> +#include <sys/resource.h> +#include <sys/syscall.h> +#include <uchar.h> +#include <unistd.h> + #include <linux/audit.h> #include <linux/capability.h> #include <linux/if_link.h> @@ -31,12 +38,6 @@ #include <linux/neighbour.h> #include <linux/oom.h> #include <linux/rtnetlink.h> -#include <net/ethernet.h> -#include <stdlib.h> -#include <sys/resource.h> -#include <sys/syscall.h> -#include <uchar.h> -#include <unistd.h> #ifdef HAVE_AUDIT #include <libaudit.h> @@ -50,7 +51,7 @@ #include <linux/btrfs.h> #endif -#include "basic/macro.h" +#include "macro.h" #ifndef RLIMIT_RTTIME #define RLIMIT_RTTIME 15 @@ -1013,4 +1014,4 @@ typedef int32_t key_serial_t; #endif -#include "basic/missing_syscall.h" +#include "missing_syscall.h" diff --git a/src/libbasic/include/basic/mount-util.h b/src/libbasic/include/basic/mount-util.h index bb5b37d9a1..bdb525d6b0 100644 --- a/src/libbasic/include/basic/mount-util.h +++ b/src/libbasic/include/basic/mount-util.h @@ -26,8 +26,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include "basic/macro.h" -#include "basic/missing.h" +#include "macro.h" +#include "missing.h" int fd_is_mount_point(int fd, const char *filename, int flags); int path_is_mount_point(const char *path, int flags); diff --git a/src/libbasic/include/basic/ordered-set.h b/src/libbasic/include/basic/ordered-set.h index 2823c17dda..e1dfc86380 100644 --- a/src/libbasic/include/basic/ordered-set.h +++ b/src/libbasic/include/basic/ordered-set.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/hashmap.h" +#include "hashmap.h" typedef struct OrderedSet OrderedSet; diff --git a/src/libbasic/include/basic/parse-util.h b/src/libbasic/include/basic/parse-util.h index 7132c958ef..7dc579a159 100644 --- a/src/libbasic/include/basic/parse-util.h +++ b/src/libbasic/include/basic/parse-util.h @@ -25,7 +25,7 @@ #include <stdint.h> #include <sys/types.h> -#include "basic/macro.h" +#include "macro.h" #define MODE_INVALID ((mode_t) -1) diff --git a/src/libbasic/include/basic/path-util.h b/src/libbasic/include/basic/path-util.h index cd787fae59..a27c13fcc3 100644 --- a/src/libbasic/include/basic/path-util.h +++ b/src/libbasic/include/basic/path-util.h @@ -23,8 +23,8 @@ #include <stdbool.h> #include <stddef.h> -#include "basic/macro.h" -#include "basic/time-util.h" +#include "macro.h" +#include "time-util.h" #define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin" diff --git a/src/libbasic/include/basic/prioq.h b/src/libbasic/include/basic/prioq.h index 25dc1a253d..113c73d040 100644 --- a/src/libbasic/include/basic/prioq.h +++ b/src/libbasic/include/basic/prioq.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "basic/hashmap.h" -#include "basic/macro.h" +#include "hashmap.h" +#include "macro.h" typedef struct Prioq Prioq; diff --git a/src/libbasic/include/basic/process-util.h b/src/libbasic/include/basic/process-util.h index 4fa45a97e3..9f75088796 100644 --- a/src/libbasic/include/basic/process-util.h +++ b/src/libbasic/include/basic/process-util.h @@ -27,8 +27,8 @@ #include <string.h> #include <sys/types.h> -#include "basic/formats-util.h" -#include "basic/macro.h" +#include "formats-util.h" +#include "macro.h" #define procfs_file_alloca(pid, field) \ ({ \ diff --git a/src/libbasic/include/basic/ratelimit.h b/src/libbasic/include/basic/ratelimit.h index f54209c534..9c8dddf5ad 100644 --- a/src/libbasic/include/basic/ratelimit.h +++ b/src/libbasic/include/basic/ratelimit.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "basic/time-util.h" -#include "basic/util.h" +#include "time-util.h" +#include "util.h" typedef struct RateLimit { usec_t interval; diff --git a/src/libbasic/include/basic/rlimit-util.h b/src/libbasic/include/basic/rlimit-util.h index d9a6a4e902..d4594eccd6 100644 --- a/src/libbasic/include/basic/rlimit-util.h +++ b/src/libbasic/include/basic/rlimit-util.h @@ -21,7 +21,7 @@ #include <sys/resource.h> -#include "basic/macro.h" +#include "macro.h" const char *rlimit_to_string(int i) _const_; int rlimit_from_string(const char *s) _pure_; diff --git a/src/libbasic/include/basic/selinux-util.h b/src/libbasic/include/basic/selinux-util.h index a619d0322a..ce6bc8e44c 100644 --- a/src/libbasic/include/basic/selinux-util.h +++ b/src/libbasic/include/basic/selinux-util.h @@ -23,7 +23,7 @@ #include <sys/socket.h> #include <sys/types.h> -#include "basic/macro.h" +#include "macro.h" bool mac_selinux_use(void); bool mac_selinux_have(void); diff --git a/src/libbasic/include/basic/set.h b/src/libbasic/include/basic/set.h index 4e74e9108b..e0d9dd001c 100644 --- a/src/libbasic/include/basic/set.h +++ b/src/libbasic/include/basic/set.h @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/hashmap.h" -#include "basic/macro.h" +#include "hashmap.h" +#include "macro.h" Set *internal_set_new(const struct hash_ops *hash_ops HASHMAP_DEBUG_PARAMS); #define set_new(ops) internal_set_new(ops HASHMAP_DEBUG_SRC_ARGS) diff --git a/src/libbasic/include/basic/signal-util.h b/src/libbasic/include/basic/signal-util.h index bfc1be809a..dfd6eb564d 100644 --- a/src/libbasic/include/basic/signal-util.h +++ b/src/libbasic/include/basic/signal-util.h @@ -21,7 +21,7 @@ #include <signal.h> -#include "basic/macro.h" +#include "macro.h" int reset_all_signal_handlers(void); int reset_signal_mask(void); diff --git a/src/libbasic/include/basic/smack-util.h b/src/libbasic/include/basic/smack-util.h index 9ff19b30b3..f90ba0a027 100644 --- a/src/libbasic/include/basic/smack-util.h +++ b/src/libbasic/include/basic/smack-util.h @@ -24,7 +24,7 @@ #include <stdbool.h> #include <sys/types.h> -#include "basic/macro.h" +#include "macro.h" #define SMACK_FLOOR_LABEL "_" #define SMACK_STAR_LABEL "*" diff --git a/src/libbasic/include/basic/socket-util.h b/src/libbasic/include/basic/socket-util.h index 199e026198..2b717a91d4 100644 --- a/src/libbasic/include/basic/socket-util.h +++ b/src/libbasic/include/basic/socket-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <linux/if_packet.h> -#include <linux/netlink.h> #include <netinet/ether.h> #include <netinet/in.h> #include <stdbool.h> @@ -29,8 +27,11 @@ #include <sys/types.h> #include <sys/un.h> -#include "basic/macro.h" -#include "basic/util.h" +#include <linux/if_packet.h> +#include <linux/netlink.h> + +#include "macro.h" +#include "util.h" union sockaddr_union { struct sockaddr sa; diff --git a/src/libbasic/include/basic/stat-util.h b/src/libbasic/include/basic/stat-util.h index 8c0cd0c97c..56d28f791e 100644 --- a/src/libbasic/include/basic/stat-util.h +++ b/src/libbasic/include/basic/stat-util.h @@ -26,7 +26,7 @@ #include <sys/types.h> #include <sys/vfs.h> -#include "basic/macro.h" +#include "macro.h" int is_symlink(const char *path); int is_dir(const char *path, bool follow); diff --git a/src/libbasic/include/basic/stdio-util.h b/src/libbasic/include/basic/stdio-util.h index 414a278d0f..bd1144b4c9 100644 --- a/src/libbasic/include/basic/stdio-util.h +++ b/src/libbasic/include/basic/stdio-util.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <sys/types.h> -#include "basic/macro.h" +#include "macro.h" #define xsprintf(buf, fmt, ...) \ assert_message_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf), "xsprintf: " #buf "[] must be big enough") diff --git a/src/libbasic/include/basic/string-table.h b/src/libbasic/include/basic/string-table.h index cf9345c80a..d88625fca7 100644 --- a/src/libbasic/include/basic/string-table.h +++ b/src/libbasic/include/basic/string-table.h @@ -26,9 +26,9 @@ #include <string.h> #include <sys/types.h> -#include "basic/macro.h" -#include "basic/parse-util.h" -#include "basic/string-util.h" +#include "macro.h" +#include "parse-util.h" +#include "string-util.h" ssize_t string_table_lookup(const char * const *table, size_t len, const char *key); diff --git a/src/libbasic/include/basic/string-util.h b/src/libbasic/include/basic/string-util.h index e0ff88b7fb..139cc8c91b 100644 --- a/src/libbasic/include/basic/string-util.h +++ b/src/libbasic/include/basic/string-util.h @@ -24,7 +24,7 @@ #include <stddef.h> #include <string.h> -#include "basic/macro.h" +#include "macro.h" /* What is interpreted as whitespace? */ #define WHITESPACE " \t\n\r" diff --git a/src/libbasic/include/basic/strv.h b/src/libbasic/include/basic/strv.h index 20773223ad..f61bbb5386 100644 --- a/src/libbasic/include/basic/strv.h +++ b/src/libbasic/include/basic/strv.h @@ -24,10 +24,10 @@ #include <stdbool.h> #include <stddef.h> -#include "basic/alloc-util.h" -#include "basic/extract-word.h" -#include "basic/macro.h" -#include "basic/util.h" +#include "alloc-util.h" +#include "extract-word.h" +#include "macro.h" +#include "util.h" char *strv_find(char **l, const char *name) _pure_; char *strv_find_prefix(char **l, const char *name) _pure_; diff --git a/src/libbasic/include/basic/strxcpyx.h b/src/libbasic/include/basic/strxcpyx.h index 7e9a5399d4..80ff58726b 100644 --- a/src/libbasic/include/basic/strxcpyx.h +++ b/src/libbasic/include/basic/strxcpyx.h @@ -22,7 +22,7 @@ #include <stddef.h> -#include "basic/macro.h" +#include "macro.h" size_t strpcpy(char **dest, size_t size, const char *src); size_t strpcpyf(char **dest, size_t size, const char *src, ...) _printf_(3, 4); diff --git a/src/libbasic/include/basic/terminal-util.h b/src/libbasic/include/basic/terminal-util.h index 51f6fd16bc..a7c96a77cb 100644 --- a/src/libbasic/include/basic/terminal-util.h +++ b/src/libbasic/include/basic/terminal-util.h @@ -24,8 +24,8 @@ #include <stdio.h> #include <sys/types.h> -#include "basic/macro.h" -#include "basic/time-util.h" +#include "macro.h" +#include "time-util.h" #define ANSI_RED "\x1B[0;31m" #define ANSI_GREEN "\x1B[0;32m" diff --git a/src/libbasic/include/basic/time-util.h b/src/libbasic/include/basic/time-util.h index 325266ec7e..a5e3f567ec 100644 --- a/src/libbasic/include/basic/time-util.h +++ b/src/libbasic/include/basic/time-util.h @@ -32,7 +32,7 @@ typedef uint64_t nsec_t; #define NSEC_FMT "%" PRIu64 #define USEC_FMT "%" PRIu64 -#include "basic/macro.h" +#include "macro.h" typedef struct dual_timestamp { usec_t realtime; diff --git a/src/libbasic/include/basic/umask-util.h b/src/libbasic/include/basic/umask-util.h index d6a9835021..359d87d27c 100644 --- a/src/libbasic/include/basic/umask-util.h +++ b/src/libbasic/include/basic/umask-util.h @@ -23,7 +23,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include "basic/macro.h" +#include "macro.h" static inline void umaskp(mode_t *u) { umask(*u); diff --git a/src/libbasic/include/basic/unit-name.h b/src/libbasic/include/basic/unit-name.h index c31e474cb7..f209a84634 100644 --- a/src/libbasic/include/basic/unit-name.h +++ b/src/libbasic/include/basic/unit-name.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "basic/macro.h" +#include "macro.h" #define UNIT_NAME_MAX 256 diff --git a/src/libbasic/include/basic/utf8.h b/src/libbasic/include/basic/utf8.h index f6fdb6eff7..f9b9c9468b 100644 --- a/src/libbasic/include/basic/utf8.h +++ b/src/libbasic/include/basic/utf8.h @@ -24,8 +24,8 @@ #include <stdint.h> #include <uchar.h> -#include "basic/macro.h" -#include "basic/missing.h" +#include "macro.h" +#include "missing.h" #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd" #define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf" diff --git a/src/libbasic/include/basic/util.h b/src/libbasic/include/basic/util.h index 18d7eb2250..1c032c15c9 100644 --- a/src/libbasic/include/basic/util.h +++ b/src/libbasic/include/basic/util.h @@ -41,10 +41,10 @@ #include <time.h> #include <unistd.h> -#include "basic/formats-util.h" -#include "basic/macro.h" -#include "basic/missing.h" -#include "basic/time-util.h" +#include "formats-util.h" +#include "macro.h" +#include "missing.h" +#include "time-util.h" size_t page_size(void) _pure_; #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) diff --git a/src/libbasic/include/basic/virt.h b/src/libbasic/include/basic/virt.h index b0e30e26f8..a538f07f6b 100644 --- a/src/libbasic/include/basic/virt.h +++ b/src/libbasic/include/basic/virt.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "basic/macro.h" +#include "macro.h" enum { VIRTUALIZATION_NONE = 0, diff --git a/src/libbasic/include/basic/web-util.h b/src/libbasic/include/basic/web-util.h index 941940e0bc..e6bb6b53f5 100644 --- a/src/libbasic/include/basic/web-util.h +++ b/src/libbasic/include/basic/web-util.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "basic/macro.h" +#include "macro.h" bool http_url_is_valid(const char *url) _pure_; diff --git a/src/libbasic/include/basic/xattr-util.h b/src/libbasic/include/basic/xattr-util.h index 9990b05af8..6fa097bf7e 100644 --- a/src/libbasic/include/basic/xattr-util.h +++ b/src/libbasic/include/basic/xattr-util.h @@ -23,7 +23,7 @@ #include <stddef.h> #include <sys/types.h> -#include "basic/time-util.h" +#include "time-util.h" int getxattr_malloc(const char *path, const char *name, char **value, bool allow_symlink); int fgetxattr_malloc(int fd, const char *name, char **value); |