basic: re-sort includes

My previous patch to only include what we use accidentially placed
the added inlcudes in non-sorted order.

diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
index 58273bb988c62c2a3acddff951a9b2584e7a437a..1ad5e4715aa45ca8cbb498e8931a860f0d2025ac 100644 (file)
--- 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/log.c b/src/basic/log.c
index 0f53f258d1a6ee6b89edc0c16946fc6f561dc234..35027de30f1343766158db340f750f907910f5f9 100644 (file)
--- 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/mkdir.c b/src/basic/mkdir.c
index 4b809541b101cd2e22967800fe4bd5cec6b7fde5..9f9d52b5df501513219498c38216daed4e9456dd 100644 (file)
--- 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.h b/src/basic/mount-util.h
index 7dbc2460168b248c6bf0f55443f2f79d5e903fd7..b7c747055a415c998d1453e31a815032e747c084 100644 (file)
--- 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/path-util.c b/src/basic/path-util.c
index 8d722bd2e7243fd7dc77b6e577fb46d01b4f3b74..413ddf965b02c7102a2af9954c2ee567d5a73c37 100644 (file)
--- 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 7d420d8a7bb8bc20f089a77dd0d0264d637e0d9b..86c5c0e9b4e6eafc41be7d49ea2da364d3807183 100644 (file)
--- 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/selinux-util.c b/src/basic/selinux-util.c
index 92473d0327b58e9a27e462cc56e117ce4291d1a0..03787ab75a0eb242e0fb5478cf2f422958e4ca28 100644 (file)
--- 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/siphash24.c b/src/basic/siphash24.c
index 0bb61ca2cb7648e42b53ca381db9b45b0db873e4..8edaae51197e22eeacdcb2f3f3315829f8718fd5 100644 (file)
--- 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/socket-util.c b/src/basic/socket-util.c
index b2aee389442b7e63b1c95c5d9b52635cb9f1f583..467a500927acb24b87ffd7366febebde6c50100c 100644 (file)
--- 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/strv.h b/src/basic/strv.h
index bb84095528739b26d0073424eaffc04bf250a492..8e29dc51ddf08cf0cb3ddd8fd2c72c7db9afd566 100644 (file)
--- 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/unit-name.c b/src/basic/unit-name.c
index d462a13831a7d55722a0bd78f99718a6e5dbf2bb..e1af224c7b3a60ab61d047d27e7804bcd44e93b6 100644 (file)
--- 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"