From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Tue, 1 Dec 2015 22:22:03 +0000 (+0100)
Subject: basic: re-sort includes
X-Git-Tag: v229.1~1^2~92
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d4b35b9aa181cc5dbd257a4a7cc9f75886a73acc;p=elogind.git

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 58273bb98..1ad5e4715 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/log.c b/src/basic/log.c
index 0f53f258d..35027de30 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/mkdir.c b/src/basic/mkdir.c
index 4b809541b..9f9d52b5d 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.h b/src/basic/mount-util.h
index 7dbc24601..b7c747055 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/path-util.c b/src/basic/path-util.c
index 8d722bd2e..413ddf965 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 7d420d8a7..86c5c0e9b 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/selinux-util.c b/src/basic/selinux-util.c
index 92473d032..03787ab75 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/siphash24.c b/src/basic/siphash24.c
index 0bb61ca2c..8edaae511 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/socket-util.c b/src/basic/socket-util.c
index b2aee3894..467a50092 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/strv.h b/src/basic/strv.h
index bb8409552..8e29dc51d 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/unit-name.c b/src/basic/unit-name.c
index d462a1383..e1af224c7 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"