diff options
Diffstat (limited to 'src')
46 files changed, 64 insertions, 64 deletions
diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c index 1aff9d5329..acd48f6954 100644 --- a/src/basic/btrfs-util.c +++ b/src/basic/btrfs-util.c @@ -49,9 +49,9 @@ #include "selinux-util.h" #include "smack-util.h" #include "sparse-endian.h" -#include "time-util.h" #include "stat-util.h" #include "string-util.h" +#include "time-util.h" #include "util.h" /* WARNING: Be careful with file system ioctls! When we get an fd, we diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c index 2c670a1ac6..8f83d9c142 100644 --- a/src/basic/calendarspec.c +++ b/src/basic/calendarspec.c @@ -30,8 +30,8 @@ #include "alloc-util.h" #include "calendarspec.h" #include "fileio.h" -#include "parse-util.h" #include "macro.h" +#include "parse-util.h" #include "string-util.h" #define BITS_WEEKDAYS 127 diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c index aac812dc52..0e5cc452b9 100644 --- a/src/basic/cap-list.c +++ b/src/basic/cap-list.c @@ -23,9 +23,9 @@ #include <string.h> #include "cap-list.h" +#include "macro.h" #include "missing.h" #include "parse-util.h" -#include "macro.h" #include "util.h" static const struct capability_name* lookup_capability(register const char *str, register unsigned int len); diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 7c580caa43..8bc2c1e799 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -34,14 +34,17 @@ #include "alloc-util.h" #include "cgroup-util.h" +#include "def.h" #include "dirent-util.h" #include "extract-word.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" #include "fs-util.h" +#include "log.h" #include "login-util.h" #include "macro.h" +#include "missing.h" #include "mkdir.h" #include "parse-util.h" #include "path-util.h" @@ -49,9 +52,6 @@ #include "process-util.h" #include "set.h" #include "special.h" -#include "def.h" -#include "log.h" -#include "missing.h" #include "stat-util.h" #include "string-table.h" #include "string-util.h" diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index b506995794..661785784a 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -28,9 +28,9 @@ #include <sys/types.h> #include "def.h" -#include "set.h" #include "hashmap.h" #include "macro.h" +#include "set.h" /* An enum of well known cgroup controllers */ typedef enum CGroupController { diff --git a/src/basic/copy.c b/src/basic/copy.c index c335959b74..024712d290 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -42,9 +42,9 @@ #include "fs-util.h" #include "io-util.h" #include "macro.h" -#include "time-util.h" #include "string-util.h" #include "strv.h" +#include "time-util.h" #include "umask-util.h" #include "xattr-util.h" diff --git a/src/basic/cpu-set-util.c b/src/basic/cpu-set-util.c index 51c0693954..85b7519953 100644 --- a/src/basic/cpu-set-util.c +++ b/src/basic/cpu-set-util.c @@ -27,9 +27,9 @@ #include "alloc-util.h" #include "cpu-set-util.h" #include "extract-word.h" -#include "parse-util.h" #include "log.h" #include "macro.h" +#include "parse-util.h" #include "string-util.h" cpu_set_t* cpu_set_malloc(unsigned *ncpus) { diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h index 58273bb988..1ad5e4715a 100644 --- a/src/basic/dirent-util.h +++ b/src/basic/dirent-util.h @@ -25,8 +25,8 @@ #include <errno.h> #include <stdbool.h> -#include "path-util.h" #include "macro.h" +#include "path-util.h" int dirent_ensure_type(DIR *d, struct dirent *de); diff --git a/src/basic/env-util.c b/src/basic/env-util.c index fe8c825f36..dd56545f12 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -28,9 +28,9 @@ #include "alloc-util.h" #include "env-util.h" -#include "parse-util.h" #include "extract-word.h" #include "macro.h" +#include "parse-util.h" #include "string-util.h" #include "strv.h" #include "utf8.h" diff --git a/src/basic/exit-status.h b/src/basic/exit-status.h index 850f58fd98..664222c1d6 100644 --- a/src/basic/exit-status.h +++ b/src/basic/exit-status.h @@ -23,9 +23,9 @@ #include <stdbool.h> -#include "set.h" #include "hashmap.h" #include "macro.h" +#include "set.h" typedef enum ExitStatus { /* EXIT_SUCCESS defined by libc */ diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index 678ac3b195..9759cac23c 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -27,11 +27,11 @@ #include <unistd.h> #include "fd-util.h" -#include "parse-util.h" -#include "socket-util.h" #include "macro.h" #include "missing.h" +#include "parse-util.h" #include "path-util.h" +#include "socket-util.h" #include "util.h" int close_nointr(int fd) { diff --git a/src/basic/fdset.c b/src/basic/fdset.c index 654ec5a639..de9b723ab8 100644 --- a/src/basic/fdset.c +++ b/src/basic/fdset.c @@ -29,11 +29,11 @@ #include "fd-util.h" #include "fdset.h" +#include "log.h" #include "macro.h" #include "parse-util.h" -#include "set.h" -#include "log.h" #include "path-util.h" +#include "set.h" #define MAKE_SET(s) ((Set*) s) #define MAKE_FDSET(s) ((FDSet*) s) diff --git a/src/basic/fdset.h b/src/basic/fdset.h index 58a5b45f28..615ba05661 100644 --- a/src/basic/fdset.h +++ b/src/basic/fdset.h @@ -23,9 +23,9 @@ #include <stdbool.h> -#include "set.h" #include "hashmap.h" #include "macro.h" +#include "set.h" typedef struct FDSet FDSet; diff --git a/src/basic/fileio-label.c b/src/basic/fileio-label.c index 52a1515cd7..1cee87c9cd 100644 --- a/src/basic/fileio-label.c +++ b/src/basic/fileio-label.c @@ -23,8 +23,8 @@ #include <sys/stat.h> #include "fileio-label.h" -#include "selinux-util.h" #include "fileio.h" +#include "selinux-util.h" int write_string_file_atomic_label(const char *fn, const char *line) { int r; diff --git a/src/basic/fileio.c b/src/basic/fileio.c index 684ce3d58f..3a237252b5 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -37,15 +37,15 @@ #include "fileio.h" #include "fs-util.h" #include "hexdecoct.h" +#include "log.h" +#include "macro.h" #include "parse-util.h" #include "path-util.h" #include "random-util.h" -#include "log.h" -#include "macro.h" -#include "time-util.h" #include "stdio-util.h" #include "string-util.h" #include "strv.h" +#include "time-util.h" #include "umask-util.h" #include "utf8.h" diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index cd7abee989..fb760abe18 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -34,15 +34,15 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "mkdir.h" -#include "parse-util.h" -#include "path-util.h" #include "log.h" #include "macro.h" #include "missing.h" -#include "time-util.h" +#include "mkdir.h" +#include "parse-util.h" +#include "path-util.h" #include "string-util.h" #include "strv.h" +#include "time-util.h" #include "user-util.h" #include "util.h" diff --git a/src/basic/label.c b/src/basic/label.c index 70e6ee20bf..f72a985967 100644 --- a/src/basic/label.c +++ b/src/basic/label.c @@ -24,9 +24,9 @@ #include <unistd.h> #include "label.h" +#include "macro.h" #include "selinux-util.h" #include "smack-util.h" -#include "macro.h" int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { int r, q; diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c index 708da0d304..7784d02168 100644 --- a/src/basic/locale-util.c +++ b/src/basic/locale-util.c @@ -34,10 +34,10 @@ #include "dirent-util.h" #include "fd-util.h" +#include "hashmap.h" #include "locale-util.h" #include "path-util.h" #include "set.h" -#include "hashmap.h" #include "string-table.h" #include "string-util.h" #include "strv.h" diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c index 704ae6cc52..6ecfc2ec46 100644 --- a/src/basic/lockfile-util.c +++ b/src/basic/lockfile-util.c @@ -30,8 +30,8 @@ #include "fd-util.h" #include "fs-util.h" #include "lockfile-util.h" -#include "path-util.h" #include "macro.h" +#include "path-util.h" int make_lock_file(const char *p, int operation, LockFile *ret) { _cleanup_close_ int fd = -1; diff --git a/src/basic/log.c b/src/basic/log.c index 829f85a5d8..1a9e6bdb91 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -49,12 +49,12 @@ #include "process-util.h" #include "signal-util.h" #include "socket-util.h" -#include "time-util.h" #include "stdio-util.h" #include "string-table.h" #include "string-util.h" #include "syslog-util.h" #include "terminal-util.h" +#include "time-util.h" #include "util.h" #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c index a9b2151195..789638f013 100644 --- a/src/basic/memfd-util.c +++ b/src/basic/memfd-util.c @@ -32,9 +32,9 @@ #include "alloc-util.h" #include "fd-util.h" +#include "macro.h" #include "memfd-util.h" #include "missing.h" -#include "macro.h" #include "string-util.h" #include "utf8.h" diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c index 4b809541b1..9f9d52b5df 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c @@ -25,9 +25,9 @@ #include <sys/stat.h> #include "fs-util.h" +#include "macro.h" #include "mkdir.h" #include "path-util.h" -#include "macro.h" #include "stat-util.h" #include "user-util.h" diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c index aaac2d47bd..10a6536cfc 100644 --- a/src/basic/mount-util.c +++ b/src/basic/mount-util.c @@ -31,11 +31,11 @@ #include "escape.h" #include "fd-util.h" #include "fileio.h" +#include "hashmap.h" #include "mount-util.h" #include "parse-util.h" #include "path-util.h" #include "set.h" -#include "hashmap.h" #include "stdio-util.h" #include "string-util.h" diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h index 3be75e6614..b37250f08e 100644 --- a/src/basic/mount-util.h +++ b/src/basic/mount-util.h @@ -28,8 +28,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include "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/basic/parse-util.c b/src/basic/parse-util.c index 3d8123ca0d..618ef5d564 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -29,8 +29,8 @@ #include "alloc-util.h" #include "extract-word.h" -#include "parse-util.h" #include "macro.h" +#include "parse-util.h" #include "string-util.h" int parse_boolean(const char *v) { diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 95b1052aeb..61fab0e087 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -34,16 +34,16 @@ #undef basename #include "alloc-util.h" +#include "extract-word.h" #include "fs-util.h" #include "log.h" #include "macro.h" #include "missing.h" #include "path-util.h" -#include "extract-word.h" -#include "time-util.h" #include "stat-util.h" #include "string-util.h" #include "strv.h" +#include "time-util.h" bool path_is_absolute(const char *p) { return p[0] == '/'; diff --git a/src/basic/prioq.c b/src/basic/prioq.c index 7d420d8a7b..86c5c0e9b4 100644 --- a/src/basic/prioq.c +++ b/src/basic/prioq.c @@ -33,8 +33,8 @@ #include <stdlib.h> #include "alloc-util.h" -#include "prioq.h" #include "hashmap.h" +#include "prioq.h" struct prioq_item { void *data; diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 1d60811cbf..4cc54a51fb 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -41,10 +41,10 @@ #include "fs-util.h" #include "ioprio.h" #include "log.h" -#include "process-util.h" -#include "signal-util.h" #include "macro.h" #include "missing.h" +#include "process-util.h" +#include "signal-util.h" #include "string-table.h" #include "string-util.h" #include "user-util.h" diff --git a/src/basic/ratelimit.c b/src/basic/ratelimit.c index ee0f8176b9..b62f3da76b 100644 --- a/src/basic/ratelimit.c +++ b/src/basic/ratelimit.c @@ -22,8 +22,8 @@ #include <sys/time.h> -#include "ratelimit.h" #include "macro.h" +#include "ratelimit.h" /* Modelled after Linux' lib/ratelimit.c by Dave Young * <hidave.darkstar@gmail.com>, which is licensed GPLv2. */ diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c index 2de965daa6..44f885db16 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c @@ -22,9 +22,9 @@ #include <errno.h> #include <sys/resource.h> +#include "macro.h" #include "missing.h" #include "rlimit-util.h" -#include "macro.h" #include "string-table.h" int setrlimit_closest(int resource, const struct rlimit *rlim) { diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c index 0408e22777..14f8474da0 100644 --- a/src/basic/rm-rf.c +++ b/src/basic/rm-rf.c @@ -30,11 +30,11 @@ #include "btrfs-util.h" #include "fd-util.h" +#include "log.h" +#include "macro.h" #include "mount-util.h" #include "path-util.h" #include "rm-rf.h" -#include "log.h" -#include "macro.h" #include "stat-util.h" #include "string-util.h" diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c index 9be8e2c76f..5956c4fe43 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -35,10 +35,10 @@ #endif #include "alloc-util.h" -#include "path-util.h" -#include "selinux-util.h" #include "log.h" #include "macro.h" +#include "path-util.h" +#include "selinux-util.h" #include "time-util.h" #include "util.h" diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c index fd9258dfca..7637fccb2f 100644 --- a/src/basic/signal-util.c +++ b/src/basic/signal-util.c @@ -23,9 +23,9 @@ #include <stdarg.h> #include <stdio.h> +#include "macro.h" #include "parse-util.h" #include "signal-util.h" -#include "macro.h" #include "string-table.h" #include "string-util.h" diff --git a/src/basic/siphash24.c b/src/basic/siphash24.c index 65667b9859..060e8ba387 100644 --- a/src/basic/siphash24.c +++ b/src/basic/siphash24.c @@ -17,8 +17,8 @@ coding style) */ -#include "siphash24.h" #include "macro.h" +#include "siphash24.h" #include "unaligned.h" static inline uint64_t rotate_left(uint64_t x, uint8_t b) { diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c index e8030c92f3..b9e4ff87d8 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c @@ -29,11 +29,11 @@ #include "alloc-util.h" #include "fileio.h" +#include "log.h" +#include "macro.h" #include "path-util.h" #include "process-util.h" #include "smack-util.h" -#include "log.h" -#include "macro.h" #include "string-table.h" #include "xattr-util.h" diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c index 2dc6c76752..e169439e04 100644 --- a/src/basic/socket-label.c +++ b/src/basic/socket-label.c @@ -31,12 +31,12 @@ #include "alloc-util.h" #include "fd-util.h" +#include "log.h" #include "macro.h" #include "missing.h" #include "mkdir.h" #include "selinux-util.h" #include "socket-util.h" -#include "log.h" int socket_address_listen( const SocketAddress *a, diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index 240fb60212..3458741cb5 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -36,12 +36,12 @@ #include "fd-util.h" #include "fileio.h" #include "formats-util.h" +#include "log.h" #include "macro.h" #include "missing.h" #include "parse-util.h" #include "path-util.h" #include "socket-util.h" -#include "log.h" #include "string-table.h" #include "string-util.h" #include "user-util.h" diff --git a/src/basic/string-table.c b/src/basic/string-table.c index 07a6d785f8..4633a57f44 100644 --- a/src/basic/string-table.c +++ b/src/basic/string-table.c @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "string-util.h" #include "string-table.h" +#include "string-util.h" ssize_t string_table_lookup(const char * const *table, size_t len, const char *key) { size_t i; diff --git a/src/basic/strv.h b/src/basic/strv.h index d0dd08baf3..bb61db2638 100644 --- a/src/basic/strv.h +++ b/src/basic/strv.h @@ -26,8 +26,8 @@ #include <stdbool.h> #include <stddef.h> -#include "extract-word.h" #include "alloc-util.h" +#include "extract-word.h" #include "macro.h" #include "util.h" diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 68664a152f..a39764472b 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -43,11 +43,11 @@ #include "fileio.h" #include "fs-util.h" #include "io-util.h" +#include "log.h" +#include "macro.h" #include "parse-util.h" #include "process-util.h" #include "socket-util.h" -#include "log.h" -#include "macro.h" #include "stat-util.h" #include "string-util.h" #include "terminal-util.h" diff --git a/src/basic/time-util.c b/src/basic/time-util.c index a9296d6ee6..bfc7cf870c 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -34,10 +34,10 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "parse-util.h" -#include "path-util.h" #include "log.h" #include "macro.h" +#include "parse-util.h" +#include "path-util.h" #include "string-util.h" #include "strv.h" #include "time-util.h" diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c index bdec97e54b..5fc3b9d6fd 100644 --- a/src/basic/unit-name.c +++ b/src/basic/unit-name.c @@ -28,8 +28,8 @@ #include "alloc-util.h" #include "bus-label.h" #include "hexdecoct.h" -#include "path-util.h" #include "macro.h" +#include "path-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" diff --git a/src/basic/user-util.c b/src/basic/user-util.c index 55c64abdd9..56e1a3be48 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -34,10 +34,10 @@ #include "alloc-util.h" #include "fd-util.h" +#include "formats-util.h" #include "macro.h" #include "parse-util.h" #include "path-util.h" -#include "formats-util.h" #include "string-util.h" #include "user-util.h" diff --git a/src/basic/util.c b/src/basic/util.c index 6d264e0007..9e0b576283 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -51,12 +51,12 @@ #include "parse-util.h" #include "path-util.h" #include "process-util.h" -#include "signal-util.h" #include "set.h" -#include "time-util.h" +#include "signal-util.h" #include "stat-util.h" #include "string-util.h" #include "strv.h" +#include "time-util.h" #include "user-util.h" #include "util.h" diff --git a/src/basic/virt.c b/src/basic/virt.c index eb67949166..d5132d1cee 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -27,8 +27,8 @@ #include "alloc-util.h" #include "fileio.h" -#include "process-util.h" #include "macro.h" +#include "process-util.h" #include "stat-util.h" #include "string-table.h" #include "string-util.h" diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c index 166e2b23fa..960209282f 100644 --- a/src/basic/xattr-util.c +++ b/src/basic/xattr-util.c @@ -29,10 +29,10 @@ #include "alloc-util.h" #include "fd-util.h" -#include "sparse-endian.h" #include "macro.h" -#include "time-util.h" +#include "sparse-endian.h" #include "stdio-util.h" +#include "time-util.h" #include "xattr-util.h" int getxattr_malloc(const char *path, const char *name, char **value, bool allow_symlink) { |