tree-wide: sort includes

Sort the includes accoding to the new coding style.

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index b0fa079fec2b560b0979d43704a1c4e8de1ce39b..a2da976bb61fbba84883cd37385424f35ebe4344 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -19,12 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "libudev.h"
-
 #include "alloc-util.h"
 #include "def.h"
 #include "escape.h"
 #include "fileio.h"
+#include "libudev.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"

diff --git a/src/basic/af-list.c b/src/basic/af-list.c
index f396115a34fd84015e80dd4ac04425c2423f26a7..07dfff6ad4bdb14e7e1bb57c8c3a60b6af26106a 100644 (file)
--- a/src/basic/af-list.c
+++ b/src/basic/af-list.c
@@ -19,16 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/socket.h>
 #include <string.h>
+#include <sys/socket.h>
 
-#include "util.h"
 #include "af-list.h"
+#include "util.h"
 
 static const struct af_name* lookup_af(register const char *str, register unsigned int len);
 
-#include "af-to-name.h"
 #include "af-from-name.h"
+#include "af-to-name.h"
 
 const char *af_to_name(int id) {
 

diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
index 284043cd900198c0d386186d869ac5887f2d88d7..03d8ad740309e1b8beb79cb4ea39eaf5978c68e3 100644 (file)
--- a/src/basic/arphrd-list.c
+++ b/src/basic/arphrd-list.c
@@ -22,13 +22,13 @@
 #include <net/if_arp.h>
 #include <string.h>
 
-#include "util.h"
 #include "arphrd-list.h"
+#include "util.h"
 
 static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
 
-#include "arphrd-to-name.h"
 #include "arphrd-from-name.h"
+#include "arphrd-to-name.h"
 
 const char *arphrd_to_name(int id) {
 

diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c
index 7151fc3d0c6fe8a4999696caee26c016e0fc51de..157ae1fb74b327000f68c7d42357e1f5acdfad88 100644 (file)
--- a/src/basic/calendarspec.c
+++ b/src/basic/calendarspec.c
@@ -23,9 +23,9 @@
 #include <string.h>
 
 #include "alloc-util.h"
-#include "string-util.h"
 #include "calendarspec.h"
 #include "fileio.h"
+#include "string-util.h"
 
 #define BITS_WEEKDAYS   127
 

diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index 4d391510bc8a254333d9ff5fc67a02a3fc92f274..f0974900cdd15305fe37cc39095a22156dd5102b 100644 (file)
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -28,8 +28,8 @@
 
 static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
 
-#include "cap-to-name.h"
 #include "cap-from-name.h"
+#include "cap-to-name.h"
 
 const char *capability_to_name(int id) {
 

diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index 34d1331486bec218f066efb33a8f0c384dbce023..22869e41366724e5c6269a1ae9024eb006b15834 100644 (file)
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -21,14 +21,14 @@
 
 #include <string.h>
 
-#include "util.h"
 #include "errno-list.h"
+#include "util.h"
 
 static const struct errno_name* lookup_errno(register const char *str,
                                                  register unsigned int len);
 
-#include "errno-to-name.h"
 #include "errno-from-name.h"
+#include "errno-to-name.h"
 
 const char *errno_to_name(int id) {
 

diff --git a/src/basic/exit-status.c b/src/basic/exit-status.c
index fcff753ada3a6592117cf74e625d42b8a8ffbf86..4c837315405ae102de1bf89ab13bcf3965a650d5 100644 (file)
--- a/src/basic/exit-status.c
+++ b/src/basic/exit-status.c
@@ -19,12 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
 #include <signal.h>
+#include <stdlib.h>
 
 #include "exit-status.h"
-#include "set.h"
 #include "macro.h"
+#include "set.h"
 
 const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
 

diff --git a/src/basic/fdset.c b/src/basic/fdset.c
index 42b0b2b98f635eaa33c8a5b2c7c24e537264d2b0..fd2e1149f52ee46095b5a9058f3d211d4c2f8d0e 100644 (file)
--- a/src/basic/fdset.c
+++ b/src/basic/fdset.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <errno.h>
 #include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
 
 #include "sd-daemon.h"

diff --git a/src/basic/fileio-label.c b/src/basic/fileio-label.c
index f596f1d11fc6d54be479bfd8f13c35079c5cf857..0405822ce08c4511cadefca4e4c8d2411b823cae 100644 (file)
--- a/src/basic/fileio-label.c
+++ b/src/basic/fileio-label.c
@@ -20,9 +20,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
-#include "selinux-util.h"
 #include "fileio-label.h"
+#include "selinux-util.h"
+#include "util.h"
 
 int write_string_file_atomic_label(const char *fn, const char *line) {
         int r;

diff --git a/src/basic/json.c b/src/basic/json.c
index 716705e5ff52a047549ce3d2c5a21df8508126d1..9d5dedb934c79c4dc4162dc7a719486fa6026a37 100644 (file)
--- a/src/basic/json.c
+++ b/src/basic/json.c
@@ -23,9 +23,9 @@
 #include <sys/types.h>
 
 #include "alloc-util.h"
+#include "hexdecoct.h"
 #include "json.h"
 #include "macro.h"
-#include "hexdecoct.h"
 #include "string-util.h"
 #include "utf8.h"
 

diff --git a/src/basic/label.c b/src/basic/label.c
index 82f10b21bd7142ed2adddd83a186afc67b28be0c..f33502f90f29730f9667a37d8d37e907aaadf593 100644 (file)
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "label.h"
 #include "selinux-util.h"
 #include "smack-util.h"
 #include "util.h"
-#include "label.h"
 
 int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         int r, q;

diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c
index 87c3aef7afebb52c1885b10e493af1f2c3b1a095..0bdbae480b1c9e9902c621fb23157bd203d2c2e8 100644 (file)
--- a/src/basic/lockfile-util.c
+++ b/src/basic/lockfile-util.c
@@ -19,12 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
-#include <stdbool.h>
 #include <errno.h>
-#include <string.h>
-#include <stdio.h>
 #include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/file.h>
 
 #include "alloc-util.h"

diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index 832f477bd2bb842781ef6d2b55eb2f013dfaf6a8..41cef14e73bba42684e1130f71213f23c914c1eb 100644 (file)
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -20,8 +20,8 @@
 ***/
 
 #include "def.h"
-#include "string-util.h"
 #include "login-util.h"
+#include "string-util.h"
 
 bool session_id_valid(const char *id) {
 

diff --git a/src/basic/mempool.c b/src/basic/mempool.c
index d5d98d88294d365ec0410fd755996c318d144429..9ee6e6a76d622b36281208b9f4ae8fd9024a4516 100644 (file)
--- a/src/basic/mempool.c
+++ b/src/basic/mempool.c
@@ -20,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "mempool.h"
 #include "macro.h"
+#include "mempool.h"
 #include "util.h"
 
 struct pool {

diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index 76bbc1edda11b9e4eef6040fb6a56f1a389a19a1..c241ef6064e74e1a3d8eecf18bf3ebe8def54e2e 100644 (file)
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -20,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "label.h"
 #include "mkdir.h"

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 0214c4627ef1e0d16564b9da38b0b82af5ddf29c..5d7fb9a12d9721031fd49ad99fed940b16e07315 100644 (file)
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <string.h>
 #include <errno.h>
+#include <string.h>
 
 #include "fs-util.h"
 #include "mkdir.h"

diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index a821a3d5bb63e930eb14ca91ec562100725ae6e6..e8ce5cfd96dba201d39637aebe87f8663a65c73a 100644 (file)
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -24,15 +24,15 @@
 #include <sys/un.h>
 
 #ifdef HAVE_SELINUX
-#include <selinux/selinux.h>
-#include <selinux/label.h>
 #include <selinux/context.h>
+#include <selinux/label.h>
+#include <selinux/selinux.h>
 #endif
 
 #include "alloc-util.h"
-#include "strv.h"
 #include "path-util.h"
 #include "selinux-util.h"
+#include "strv.h"
 
 #ifdef HAVE_SELINUX
 DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon);

diff --git a/src/basic/sigbus.c b/src/basic/sigbus.c
index 0108603fe83ddf2d1733637df85b0a78066be3fd..c535c89d5280dbd141fbe2cc6b7b303d97a92043 100644 (file)
--- a/src/basic/sigbus.c
+++ b/src/basic/sigbus.c
@@ -23,8 +23,8 @@
 #include <sys/mman.h>
 
 #include "macro.h"
-#include "util.h"
 #include "sigbus.h"
+#include "util.h"
 
 #define SIGBUS_QUEUE_MAX 64
 

diff --git a/src/basic/siphash24.c b/src/basic/siphash24.c
index d7640d395ded78e0827bfdd79da180ed3a1f6fed..485e0059cbcb683743cb82a671e57b13fdd0293d 100644 (file)
--- a/src/basic/siphash24.c
+++ b/src/basic/siphash24.c
@@ -17,9 +17,8 @@
     coding style)
 */
 
-#include "sparse-endian.h"
-
 #include "siphash24.h"
+#include "sparse-endian.h"
 #include "unaligned.h"
 #include "util.h"
 

diff --git a/src/basic/strv.c b/src/basic/strv.c
index ba6df716a71c798e47396bfc97f45cae8a51dfd5..771781f9fc764386cf772097b651e873678e6170 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -27,8 +27,8 @@
 #include "alloc-util.h"
 #include "escape.h"
 #include "string-util.h"
-#include "util.h"
 #include "strv.h"
+#include "util.h"
 
 char *strv_find(char **l, const char *name) {
         char **i;

diff --git a/src/basic/strxcpyx.c b/src/basic/strxcpyx.c
index 6542c0abf54d77dc4c363db0759a028a11ef95f4..088ba53c29d1f6b3c30c7cfa603b4929b6110891 100644 (file)
--- a/src/basic/strxcpyx.c
+++ b/src/basic/strxcpyx.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include "strxcpyx.h"
 
 size_t strpcpy(char **dest, size_t size, const char *src) {

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index d6c936db370d93ce532c4693249dfa4af34f80d0..397880b0b1d605e18f98ccf158f8c36cf3885a9f 100644 (file)
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <pwd.h>
 #include <grp.h>
+#include <pwd.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"

diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index 7600d9990322149202df847b712a537e76963599..b4063a4ceca64966ee73cd405cf7fdeda5c61237 100644 (file)
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -44,10 +44,10 @@
  */
 
 #include <errno.h>
-#include <stdlib.h>
 #include <inttypes.h>
-#include <string.h>
 #include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "alloc-util.h"
 #include "hexdecoct.h"

diff --git a/src/basic/util.c b/src/basic/util.c
index 08bdcd28f256abc52323d62c9290da7a4765fcbf..3e4ec42a28bcf16936d9b83da3cafcbe23d91506 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -73,6 +73,7 @@
 #include "build.h"
 #include "def.h"
 #include "device-nodes.h"
+#include "dirent-util.h"
 #include "env-util.h"
 #include "escape.h"
 #include "exit-status.h"
@@ -81,19 +82,20 @@
 #include "formats-util.h"
 #include "gunicode.h"
 #include "hashmap.h"
+#include "hexdecoct.h"
 #include "hostname-util.h"
 #include "ioprio.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "mkdir.h"
-#include "hexdecoct.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "random-util.h"
 #include "signal-util.h"
 #include "sparse-endian.h"
+#include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
@@ -102,8 +104,6 @@
 #include "utf8.h"
 #include "util.h"
 #include "virt.h"
-#include "dirent-util.h"
-#include "stat-util.h"
 
 /* Put this test here for a lack of better place */
 assert_cc(EAGAIN == EWOULDBLOCK);

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 38b79da8866defe6e2c1fe7625dfb671e9689a7d..6d35adc0e2f4bb287362e5a0452b6059507c57cb 100644 (file)
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -18,12 +18,12 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "util.h"
 #include "console.h"
-#include "graphics.h"
-#include "pefile.h"
 #include "disk.h"
+#include "graphics.h"
 #include "linux.h"
+#include "pefile.h"
+#include "util.h"
 
 #ifndef EFI_OS_INDICATIONS_BOOT_TO_FW_UI
 #define EFI_OS_INDICATIONS_BOOT_TO_FW_UI 0x0000000000000001ULL

diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c
index 66aa88f32eaeed9a861bd99dfb905b991644effb..2151d3443202bf828bd00a95d1b951fc23a3c9df 100644 (file)
--- a/src/boot/efi/console.c
+++ b/src/boot/efi/console.c
@@ -18,8 +18,8 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "util.h"
 #include "console.h"
+#include "util.h"
 
 #define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \
         { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } }

diff --git a/src/boot/efi/graphics.c b/src/boot/efi/graphics.c
index f732428216793845f2ea5afe37c47e49bc3ab53b..efa91fa7ac27892e785214d682043cbb541a7bd9 100644 (file)
--- a/src/boot/efi/graphics.c
+++ b/src/boot/efi/graphics.c
@@ -20,8 +20,8 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "util.h"
 #include "graphics.h"
+#include "util.h"
 
 EFI_STATUS graphics_mode(BOOLEAN on) {
         #define EFI_CONSOLE_CONTROL_PROTOCOL_GUID \

diff --git a/src/boot/efi/linux.c b/src/boot/efi/linux.c
index 809c69310e32bca9275a52bbcd610202ba96826e..e9d097c1329cbd6ddc3f8c16aecaa6d0f4ccd640 100644 (file)
--- a/src/boot/efi/linux.c
+++ b/src/boot/efi/linux.c
@@ -17,8 +17,8 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "util.h"
 #include "linux.h"
+#include "util.h"
 
 #define SETUP_MAGIC             0x53726448      /* "HdrS" */
 struct SetupHeader {

diff --git a/src/boot/efi/pefile.c b/src/boot/efi/pefile.c
index e6fedbc929fa81c29277412a2f71b3eabafa10c2..efb3271ee3ca952a31371a142ba92701f70aa03d 100644 (file)
--- a/src/boot/efi/pefile.c
+++ b/src/boot/efi/pefile.c
@@ -17,8 +17,8 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "util.h"
 #include "pefile.h"
+#include "util.h"
 
 struct DosFileHeader {
         UINT8   Magic[2];

diff --git a/src/boot/efi/splash.c b/src/boot/efi/splash.c
index 470ea3e2cc85a57956ebb84aff6770159a158f33..b584b5e6a91ee18df3b59f977b41e1a69bbb61b4 100644 (file)
--- a/src/boot/efi/splash.c
+++ b/src/boot/efi/splash.c
@@ -18,9 +18,9 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "util.h"
 #include "graphics.h"
 #include "splash.h"
+#include "util.h"
 
 struct bmp_file {
         CHAR8 signature[2];

diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index 0c5ee4e9ff5316864e6808cbaa6c51712832bd40..2cd5c33cb6e085bd8605980b5cc12657899e869a 100644 (file)
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@ -16,12 +16,12 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "util.h"
-#include "pefile.h"
 #include "disk.h"
 #include "graphics.h"
-#include "splash.h"
 #include "linux.h"
+#include "pefile.h"
+#include "splash.h"
+#include "util.h"
 
 /* magic string to find in the binary image */
 static const char __attribute__((used)) magic[] = "#### LoaderInfo: systemd-stub " VERSION " ####";

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index 05330c057799a2a029a0272fcdfaa90b001a4806..2bf473ffc18a2dcb4aed0133ce7834776fbbb5f8 100644 (file)
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -22,25 +22,25 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
+#include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/utsname.h>
 #include <time.h>
-#include <limits.h>
 #include <unistd.h>
-#include <sys/utsname.h>
-#include <fcntl.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
-#include "util.h"
+#include "bootchart.h"
+#include "fd-util.h"
 #include "fileio.h"
+#include "list.h"
 #include "macro.h"
 #include "store.h"
 #include "svg.h"
-#include "bootchart.h"
-#include "list.h"
 #include "utf8.h"
-#include "fd-util.h"
+#include "util.h"
 
 #define time_to_graph(t) ((t) * arg_scale_x)
 #define ps_to_graph(n) ((n) * arg_scale_y)

diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c
index 6e478842093f1aaeaf691cc02160a849432416c6..2dc5fe631bbc5ff3c8d53b127d09255bc9c3ae51 100644 (file)
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/bus-proxyd/stdio-bridge.c
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
 #include "sd-bus.h"
+#include "sd-daemon.h"
 
 #include "alloc-util.h"
 #include "bus-internal.h"

diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index 3ae46d8cfb8d3cf6bc37f12515a71f109c7f2c4a..0a484d89fc427663993d2296942e71085ecde97b 100644 (file)
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -21,16 +21,17 @@
 
 
 #include <errno.h>
+
 #include "audit-fd.h"
 
 #ifdef HAVE_AUDIT
 
-#include <stdbool.h>
 #include <libaudit.h>
+#include <stdbool.h>
 
+#include "fd-util.h"
 #include "log.h"
 #include "util.h"
-#include "fd-util.h"
 
 static bool initialized = false;
 static int audit_fd;

diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c
index 45f2c2ffd64411798a564ad9790c12fd434273ee..54830a515b83396aedf6b63610d7fd660a41a9ec 100644 (file)
--- a/src/core/dbus-automount.c
+++ b/src/core/dbus-automount.c
@@ -21,8 +21,8 @@
 
 #include "automount.h"
 #include "bus-util.h"
-#include "string-util.h"
 #include "dbus-automount.h"
+#include "string-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, automount_result, AutomountResult);
 

diff --git a/src/core/dbus-busname.c b/src/core/dbus-busname.c
index 05ac89c3c0344feee7e162746331c4db32190897..445b237643196bf9ce9574b736a71e9f2e5a97e9 100644 (file)
--- a/src/core/dbus-busname.c
+++ b/src/core/dbus-busname.c
@@ -21,9 +21,9 @@
 
 #include "bus-util.h"
 #include "busname.h"
+#include "dbus-busname.h"
 #include "string-util.h"
 #include "unit.h"
-#include "dbus-busname.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult);
 

diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c
index cb156fd37ca280003e0b1e7f405d5a03c39d072a..97e4a4755603f33c63414faaf9d8444d1e9f0159 100644 (file)
--- a/src/core/dbus-device.c
+++ b/src/core/dbus-device.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "unit.h"
-#include "device.h"
 #include "dbus-device.h"
+#include "device.h"
+#include "unit.h"
 
 const sd_bus_vtable bus_device_vtable[] = {
         SD_BUS_VTABLE_START(0),

diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c
index 3b8116281c019ce45e28184339e5a77102457d78..c633eb1b762bc9f17b14421dae0604d9f2b80ac7 100644 (file)
--- a/src/core/dbus-kill.c
+++ b/src/core/dbus-kill.c
@@ -19,11 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "signal-util.h"
 #include "bus-util.h"
-
-#include "kill.h"
 #include "dbus-kill.h"
+#include "kill.h"
+#include "signal-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode);
 

diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index 90a6d3707325ba216bf00683f8599a1e9a257e91..bc5751a10d4f5d91e3f68f8247cb514d4edd523a 100644 (file)
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -23,10 +23,10 @@
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
+#include "dbus-mount.h"
 #include "mount.h"
 #include "string-util.h"
 #include "unit.h"
-#include "dbus-mount.h"
 
 static int property_get_what(
                 sd_bus *bus,

diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c
index 9e32b5fb06d9c8a60d5d7d498595387df5f968db..e0544e9161d90eeeb823dac67c9557ac3dc92ae1 100644 (file)
--- a/src/core/dbus-path.c
+++ b/src/core/dbus-path.c
@@ -20,10 +20,10 @@
 ***/
 
 #include "bus-util.h"
+#include "dbus-path.h"
 #include "path.h"
 #include "string-util.h"
 #include "unit.h"
-#include "dbus-path.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, path_result, PathResult);
 

diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index 09e78d1f33bfa307e5c2f3a9db43065e87d06aa0..469e3e1c937e4dea9ce4d86180f59a2c323e0cf6 100644 (file)
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "unit.h"
-#include "slice.h"
 #include "dbus-cgroup.h"
 #include "dbus-slice.h"
+#include "slice.h"
+#include "unit.h"
 
 const sd_bus_vtable bus_slice_vtable[] = {
         SD_BUS_VTABLE_START(0),

diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
index 603ca95fd9fe02de096eced7af1aee7f00b1e603..f2a0f1d172a4eb5661642834737a5476780ac47b 100644 (file)
--- a/src/core/dbus-swap.c
+++ b/src/core/dbus-swap.c
@@ -23,10 +23,10 @@
 #include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
+#include "dbus-swap.h"
 #include "string-util.h"
 #include "swap.h"
 #include "unit.h"
-#include "dbus-swap.h"
 
 static int property_get_priority(
                 sd_bus *bus,

diff --git a/src/core/dbus-target.c b/src/core/dbus-target.c
index 350f5c3ed2248a09716dfb640d8de5d9777ce882..654bcf1a297b399f171a567d8ceba41e0437cce2 100644 (file)
--- a/src/core/dbus-target.c
+++ b/src/core/dbus-target.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "unit.h"
 #include "dbus-target.h"
+#include "unit.h"
 
 const sd_bus_vtable bus_target_vtable[] = {
         SD_BUS_VTABLE_START(0),

diff --git a/src/core/device.c b/src/core/device.c
index bcd4d1146bec44bb9a44c9ebf4ad75c26e0dba63..5b7130ba97d8b59c62286af749f5ab5f7fc83e04 100644 (file)
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -22,11 +22,10 @@
 #include <errno.h>
 #include <sys/epoll.h>
 
-#include "libudev.h"
-
 #include "alloc-util.h"
 #include "dbus-device.h"
 #include "device.h"
+#include "libudev.h"
 #include "log.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 3645f9c515eb67ee9e5f279498b0a3a60abc4999..d92a9a764f6302b6981098211a0b3f774a1360c0 100644 (file)
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -25,12 +25,12 @@
 
 #include "alloc-util.h"
 #include "fileio.h"
+#include "hostname-setup.h"
 #include "hostname-util.h"
 #include "log.h"
 #include "macro.h"
 #include "string-util.h"
 #include "util.h"
-#include "hostname-setup.h"
 
 int hostname_setup(void) {
         int r;

diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
index 9572fa17d9cd61f3c53aacfd03ce4f0aca63d10c..4f42ae6f31b62606ef42684df68b4bb8a19122fc 100644 (file)
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -21,8 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 651f79a1fe5cbc086bcd3eed782d14908a9eefc6..a6ab8cf4b38b556b882792c5f1de924cd2a9517d 100644 (file)
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -19,17 +19,17 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifdef HAVE_KMOD
 #include <libkmod.h>
 #endif
 
-#include "macro.h"
-#include "capability-util.h"
 #include "bus-util.h"
+#include "capability-util.h"
 #include "kmod-setup.h"
+#include "macro.h"
 
 #ifdef HAVE_KMOD
 static void systemd_kmod_log(

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 11566af51b62241ab04e37ec3eee3055232a388f..3fa66f91aad61e464f062744a5e9fa7495b13284 100644 (file)
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -20,13 +20,13 @@
 ***/
 
 
-#include "unit.h"
+#include "conf-parser.h"
 #include "load-dropin.h"
+#include "load-fragment.h"
 #include "log.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "conf-parser.h"
-#include "load-fragment.h"
+#include "unit.h"
 
 static int add_dependency_consumer(
                 UnitDependency dependency,

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 5d013de2e84d81270b4518d9e7f3cc558be8ce41..dda79267f7083ea47b17ed40f9d96fb567c6a69a 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -32,8 +32,8 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 
-#include "alloc-util.h"
 #include "af-list.h"
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-util.h"

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index bd632131b90cde0d699f53a97baf78473de82a32..4c8d920389fc8c6c5fb954f94d8e7526ec6e92df 100644 (file)
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -24,12 +24,12 @@
 
 #include "env-util.h"
 #include "fileio.h"
+#include "locale-setup.h"
 #include "locale-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
 #include "virt.h"
-#include "locale-setup.h"
 
 int locale_setup(char ***environment) {
         char **add;

diff --git a/src/core/main.c b/src/core/main.c
index a09ce0f083668c5323adfb33194bd54f551f4da0..97f904b031618c229b972ae6d466cc4027a5df32 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -37,8 +37,8 @@
 #include <valgrind/valgrind.h>
 #endif
 
-#include "sd-daemon.h"
 #include "sd-bus.h"
+#include "sd-daemon.h"
 
 #include "alloc-util.h"
 #include "architecture.h"

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index b2596d1cd199e55aab1167565b4e38863e1e6d29..2b8d590ed1f94dbffbbc65df1e25f7e2b9f2c313 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/mount.h>
 #include <errno.h>
+#include <ftw.h>
 #include <stdlib.h>
+#include <sys/mount.h>
 #include <unistd.h>
-#include <ftw.h>
 
 #include "alloc-util.h"
 #include "bus-util.h"

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index 4bcdd273899d2080166dbbbb6c3cb1895c7f1612..8856927c88f62664bc4f34eb3ccda60a4dd8a3f5 100644 (file)
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -23,10 +23,10 @@
 
 #ifdef HAVE_SELINUX
 
-#include <stdio.h>
 #include <errno.h>
-#include <selinux/selinux.h>
 #include <selinux/avc.h>
+#include <selinux/selinux.h>
+#include <stdio.h>
 #ifdef HAVE_AUDIT
 #include <libaudit.h>
 #endif

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index d9b00fb95c46fc54943a9a9559091a85988eb55b..d4757e08530ace7fa59c7b59bf265732f1b52bbe 100644 (file)
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -29,10 +29,10 @@
 
 #include "log.h"
 #include "macro.h"
+#include "selinux-setup.h"
 #include "selinux-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "selinux-setup.h"
 
 #ifdef HAVE_SELINUX
 _printf_(2,3)

diff --git a/src/core/slice.c b/src/core/slice.c
index 9c488f0fd7804b9268b987029f9ba5e6762f4aec..06ac6f84502f9a9eb50d56d3a8982161ae4dd93f 100644 (file)
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -24,12 +24,12 @@
 #include "alloc-util.h"
 #include "dbus-slice.h"
 #include "log.h"
+#include "slice.h"
 #include "special.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "slice.h"
 
 static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
         [SLICE_DEAD] = UNIT_INACTIVE,

diff --git a/src/core/swap.c b/src/core/swap.c
index ee0838e6762faf7a3435c3b5b9824b9cf90d9409..f9e1ebad49c8ed1bd9609adf50d1fae96f838c4e 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -24,8 +24,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "alloc-util.h"
 #include "dbus-swap.h"
 #include "escape.h"
@@ -33,6 +31,7 @@
 #include "fd-util.h"
 #include "formats-util.h"
 #include "fstab-util.h"
+#include "libudev.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/core/transaction.c b/src/core/transaction.c
index cf37b5eb7505bc3126474ca37bc4c01001500656..15e79d00b30c15c24e629fa5f7c985134a8b8096 100644 (file)
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"

diff --git a/src/core/umount.c b/src/core/umount.c
index 9d1f7660db7bc11569cb87b2b9886775a305f4fd..954e50528d31c6cd8b4bd859c9d8ec5b2f9f4f1c 100644 (file)
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -27,12 +27,11 @@
 #include <sys/mount.h>
 #include <sys/swap.h>
 
-#include "libudev.h"
-
 #include "alloc-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fstab-util.h"
+#include "libudev.h"
 #include "list.h"
 #include "mount-setup.h"
 #include "path-util.h"

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 5b806a1e69168380db3eb29f1c4fa76132b5dce2..e0436d794ce8dd896b4b712e141f310b5495bbb1 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -20,14 +20,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
-#include <stdbool.h>
 #include <errno.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/prctl.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "sd-bus.h"
 #include "sd-device.h"

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 34852ce38183b3ce1285dd6dbca4cda8ca967866..c32bf1c9d64b0fe7587bd178ef0a71a90a155013 100644 (file)
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -19,12 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
+#include <blkid/blkid.h>
 #include <stdlib.h>
 #include <sys/statfs.h>
-#include <blkid/blkid.h>
+#include <unistd.h>
 
-#include "libudev.h"
 #include "sd-id128.h"
 
 #include "alloc-util.h"
@@ -37,6 +36,7 @@
 #include "fstab-util.h"
 #include "generator.h"
 #include "gpt.h"
+#include "libudev.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "mount-util.h"

diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index 316a2803d31fb25ad3db8b91482df8885e7a0726..2e1259ef6833f9b0561d933cc190f3470b2c95fb 100644 (file)
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
 #include <sys/stat.h>
 
 #include "alloc-util.h"

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 92061532b8e2074d0d5a4c03889838656c96e79a..dde2baf66172043efaad36fa45405658c5ab6fa5 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -21,8 +21,8 @@
 
 #include <errno.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "bus-util.h"

diff --git a/src/import/aufs-util.c b/src/import/aufs-util.c
index 7b1ac134a0d2116fced81d3168b7a8669ea70109..82f519958cc83a9cacd56d7735ef21b94f537d63 100644 (file)
--- a/src/import/aufs-util.c
+++ b/src/import/aufs-util.c
@@ -21,10 +21,10 @@
 
 #include <ftw.h>
 
+#include "aufs-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
-#include "aufs-util.h"
 
 static int nftw_cb(
                 const char *fpath,

diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index 103d45bf218b2028130253d320144d52814cb72b..28c87594d68dcde59873205bf4c8261cdd97fc3c 100644 (file)
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -20,6 +20,10 @@
 ***/
 
 #include <sys/sendfile.h>
+
+/* When we include libgen.h because we need dirname() we immediately
+ * undefine basename() since libgen.h defines it as a macro to the POSIX
+ * version which is really broken. We prefer GNU basename(). */
 #include <libgen.h>
 #undef basename
 

diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index e7fcd293f17eb8d4a3067936fbed018534a3119b..2e48167c5442d1c0808b5dd029784c4d23907495 100644 (file)
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/prctl.h>
 #include <curl/curl.h>
+#include <sys/prctl.h>
 
 #include "sd-daemon.h"
 

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index d4f8673187c3de8ce14d906e14d20d4c4d796b5f..a35f2b541cc0603eb435128df96e3a20c2ac5070 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
+#include <ctype.h>
 #include <errno.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <sys/epoll.h>
-#include <ctype.h>
+#include <unistd.h>
 
 #include "sd-bus.h"
 #include "sd-daemon.h"

diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 3ee6d32bf72fb76750d3ca2a389dbf11d546b88e..a6d7c3b7e8c8d9fffbf49c4c1935f31e18b6d35d 100644 (file)
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -19,9 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdbool.h>
-
 #include <curl/curl.h>
+#include <stdbool.h>
 
 #include "alloc-util.h"
 #include "journal-upload.h"

diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index b2c398a845b83e0baf7c33b66c2d5a1cf8e8cc24..09e6da0031d66c5f66af27c16edf212494875f02 100644 (file)
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -32,10 +32,10 @@
 #include "alloc-util.h"
 #include "log.h"
 #include "macro.h"
+#include "microhttpd-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "microhttpd-util.h"
 
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         char *f;

diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c
index 4888c7d05dccdecb69c0fd4732cb9b1c08b38ee6..086bf7e7e3ecd52852e7e8ab3fd82ea19557be22 100644 (file)
--- a/src/journal/audit-type.c
+++ b/src/journal/audit-type.c
@@ -25,8 +25,7 @@
 #  include <libaudit.h>
 #endif
 
-#include "audit-type.h"
-#include "macro.h"
 #include "missing.h"
-
+#include "audit-type.h"
 #include "audit_type-to-name.h"
+#include "macro.h"

diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
index 0c4ac5cdc38d1b2f4c39cf6c29553a2b874b5a55..aeec83da1ed4901910e12062e30f9fa905e6e0b4 100644 (file)
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -24,10 +24,10 @@
 
 #include "fd-util.h"
 #include "fsprg.h"
+#include "hexdecoct.h"
 #include "journal-authenticate.h"
 #include "journal-def.h"
 #include "journal-file.h"
-#include "hexdecoct.h"
 
 static uint64_t journal_file_tag_seqnum(JournalFile *f) {
         uint64_t r;

diff --git a/src/journal/journal-qrcode.c b/src/journal/journal-qrcode.c
index 1db66e89c64397c8c36c9f5f0f8ca683e7399370..257ddb302b774bc1abddfe08dc31349f32af43f3 100644 (file)
--- a/src/journal/journal-qrcode.c
+++ b/src/journal/journal-qrcode.c
@@ -20,12 +20,11 @@
 ***/
 
 #include <assert.h>
-#include <stdio.h>
 #include <errno.h>
-#include <stdlib.h>
-#include <stdbool.h>
-
 #include <qrencode.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "journal-qrcode.h"
 

diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 3676cb87887dbeca4067b5a8de19f43821b9b21b..715847e0184c243db69f9921380913c30325d458 100644 (file)
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
-#include <sys/mman.h>
 #include <fcntl.h>
 #include <stddef.h>
+#include <sys/mman.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "compress.h"

diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 89f3d4b42f1bd468cb4a7301be61872565c2c35c..04487c29b5a5217cd751d3c809c6219c3b90e977 100644 (file)
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <time.h>
 #include <fcntl.h>
 #include <sys/socket.h>
+#include <time.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"

diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index e048e04716b4cbda59722f4bd4afd00fa38f79de..9a8d1e026ba14a594cc5145af45c94bbbb24bd2a 100644 (file)
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -25,7 +25,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "libudev.h"
 #include "sd-messages.h"
 
 #include "escape.h"
@@ -35,6 +34,7 @@
 #include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
+#include "libudev.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "stdio-util.h"

diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index ad78d0929441f95f42493f1ba02766aa51f60ea7..65e2c3e5702c969b6d106bff32b56a2561bbb285 100644 (file)
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -24,11 +24,11 @@
 
 #include "alloc-util.h"
 #include "hashmap.h"
+#include "journald-rate-limit.h"
 #include "list.h"
 #include "random-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "journald-rate-limit.h"
 
 #define POOLS_MAX 5
 #define BUCKETS_MAX 127

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index be913d26ef465af049f8ad2ca8971ce80fc61a23..b532616db6f6f738e32fd2637d9139872fb71e45 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -28,7 +28,6 @@
 #include <sys/statvfs.h>
 #include <linux/sockios.h>
 
-#include "libudev.h"
 #include "sd-daemon.h"
 #include "sd-journal.h"
 #include "sd-messages.h"
@@ -58,6 +57,7 @@
 #include "journald-server.h"
 #include "journald-stream.h"
 #include "journald-syslog.h"
+#include "libudev.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"

diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c
index 69540f11416b727bb5d9fc8ddb2524a3a79daa37..88bea3b86e07e9ac8ae63fa98b35711a5a9cfd92 100644 (file)
--- a/src/journal/journald-wall.c
+++ b/src/journal/journald-wall.c
@@ -22,10 +22,10 @@
 #include "alloc-util.h"
 #include "formats-util.h"
 #include "journald-server.h"
+#include "journald-wall.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "utmp-wtmp.h"
-#include "journald-wall.h"
 
 void server_forward_wall(
                 Server *s,

diff --git a/src/journal/journald.c b/src/journal/journald.c
index b137e3c7beadbd85dcd4166c095ac0f3bc767ee4..b9f5c099e1c31fd3ae9f895fb2d4ff712664ea97 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -21,16 +21,15 @@
 
 #include <unistd.h>
 
-#include "sd-messages.h"
 #include "sd-daemon.h"
+#include "sd-messages.h"
 
+#include "formats-util.h"
 #include "journal-authenticate.h"
-#include "journald-server.h"
 #include "journald-kmsg.h"
+#include "journald-server.h"
 #include "journald-syslog.h"
-
 #include "sigbus.h"
-#include "formats-util.h"
 
 int main(int argc, char *argv[]) {
         Server server;

diff --git a/src/journal/lookup3.c b/src/journal/lookup3.c
index 52ffdf7b1d8cd735d407a920a133719963ded9d1..3d791234f43165f3661f9b1dfb4b8562c04941cc 100644 (file)
--- a/src/journal/lookup3.c
+++ b/src/journal/lookup3.c
@@ -40,10 +40,10 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy.
 */
 /* #define SELF_TEST 1 */
 
-#include <stdio.h>      /* defines printf for tests */
-#include <time.h>       /* defines time_t for timings in the test */
 #include <stdint.h>     /* defines uint32_t etc */
+#include <stdio.h>      /* defines printf for tests */
 #include <sys/param.h>  /* attempt to define endianness */
+#include <time.h>       /* defines time_t for timings in the test */
 #ifdef linux
 # include <endian.h>    /* attempt to define endianness */
 #endif

diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 3cb1dfa986a5189976398fac9a1fe718fff6f189..95402578957a5344fac78f8f32d616d15410345b 100644 (file)
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -27,10 +27,10 @@
 #include "hashmap.h"
 #include "list.h"
 #include "log.h"
-#include "util.h"
 #include "macro.h"
-#include "sigbus.h"
 #include "mmap-cache.h"
+#include "sigbus.h"
+#include "util.h"
 
 typedef struct Window Window;
 typedef struct Context Context;

diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index aea8fd15e6a1647c51db5520b6d9b52fae76ec75..25980b7744e794d70a9ae6072bb2ec2558f6b7b2 100644 (file)
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -20,10 +20,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <locale.h>
-#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <locale.h>
+#include <unistd.h>
 
 #include "sd-messages.h"
 

diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c
index 040c7d58fb5150eb6d2c504a4ef9cea37bc0b3ea..8f56ea19072c1268f36c533a72e484f99e9dc744 100644 (file)
--- a/src/journal/test-journal-enum.c
+++ b/src/journal/test-journal-enum.c
@@ -23,9 +23,9 @@
 
 #include "sd-journal.h"
 
+#include "journal-internal.h"
 #include "log.h"
 #include "macro.h"
-#include "journal-internal.h"
 
 int main(int argc, char *argv[]) {
         unsigned n = 0;

diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 4ad89fe4b6a33126953c5cea351a5dea857a3fa4..5c055ef748ae5ada10dc2f7c463628633b4e2b2e 100644 (file)
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -20,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "sd-journal.h"
 

diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index 887a83efe1de9edf73defd9600c90bbc85845fb0..a7abb11fba8721d5fd25f23d52af1d174e09f198 100644 (file)
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include "fd-util.h"
 #include "journal-file.h"

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 01d4bc968a247936b915c3729637dbaf160b05ab..266e0d547380690d478f756b24bd296b92fef4cf 100644 (file)
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -22,11 +22,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "log.h"
-#include "rm-rf.h"
-#include "journal-file.h"
 #include "journal-authenticate.h"
+#include "journal-file.h"
 #include "journal-vacuum.h"
+#include "log.h"
+#include "rm-rf.h"
 
 static bool arg_keep = false;
 

diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index 368525c40ac2de3e6dd3bdcdb11ba65ccf0c8f43..f8e6cb6ea98ce72ac012423004db07af68789d04 100644 (file)
--- a/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "libudev.h"
 #include "sd-id128.h"
 
 #include "dhcp-identifier.h"
 #include "dhcp6-protocol.h"
+#include "libudev.h"
 #include "network-internal.h"
 #include "siphash24.h"
 #include "sparse-endian.h"

diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c
index 36be7d54ed2373af33a511f15b555fce8ca14348..a6c410ba9118bac4d65428fa2acc713c8e42220a 100644 (file)
--- a/src/libsystemd-network/dhcp-option.c
+++ b/src/libsystemd-network/dhcp-option.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdint.h>
-#include <string.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "dhcp-internal.h"
 

diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c
index cd7f5095ca9d0d1311afcd12fee869eeac91078a..9ff42b155ebdc3646adcfa3bc3b41776c278c3c1 100644 (file)
--- a/src/libsystemd-network/dhcp-packet.c
+++ b/src/libsystemd-network/dhcp-packet.c
@@ -19,13 +19,12 @@
 ***/
 
 #include <errno.h>
-#include <string.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
+#include <string.h>
 
-
-#include "dhcp-protocol.h"
 #include "dhcp-internal.h"
+#include "dhcp-protocol.h"
 
 #define DHCP_CLIENT_MIN_OPTIONS_SIZE            312
 

diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index 0f46df6a1b93056d2faa8112f6c36b681e62b1a8..62023a9e490354b7f6d3704603aae8f82268547f 100644 (file)
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <netinet/in.h>
 #include <errno.h>
+#include <netinet/in.h>
 #include <string.h>
 
 #include "alloc-util.h"

diff --git a/src/libsystemd-network/lldp-port.c b/src/libsystemd-network/lldp-port.c
index 97b6b485d264310c75914f403fdb857c72e6b7d8..1f1a49adbf80aaf41e12da60015d1213083b0323 100644 (file)
--- a/src/libsystemd-network/lldp-port.c
+++ b/src/libsystemd-network/lldp-port.c
@@ -22,9 +22,9 @@
 
 #include "alloc-util.h"
 #include "async.h"
-#include "lldp-port.h"
-#include "lldp-network.h"
 #include "lldp-internal.h"
+#include "lldp-network.h"
+#include "lldp-port.h"
 
 int lldp_port_start(lldp_port *p) {
         int r;

diff --git a/src/libsystemd-network/lldp-tlv.c b/src/libsystemd-network/lldp-tlv.c
index 789016049773f263f700878fe1fba44a28b120e0..66343147a1ca3963b392166ad5ff90df4d93952a 100644 (file)
--- a/src/libsystemd-network/lldp-tlv.c
+++ b/src/libsystemd-network/lldp-tlv.c
@@ -20,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <net/ethernet.h>
 #include <arpa/inet.h>
+#include <net/ethernet.h>
 
 #include "alloc-util.h"
 #include "lldp-tlv.h"

diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index ab20b6065a3b1b40b2237028c90ff19bcaf3114e..49a755c0486387e9a58f9961a09f499022d41140 100644 (file)
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -29,9 +29,9 @@
 #include "condition.h"
 #include "conf-parser.h"
 #include "dhcp-lease-internal.h"
+#include "hexdecoct.h"
 #include "log.h"
 #include "network-internal.h"
-#include "hexdecoct.h"
 #include "parse-util.h"
 #include "siphash24.h"
 #include "string-util.h"

diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c
index 94c31af3f3d06f8cecc250df1e40faf740cdce22..69eff5116f5eeecfa2bcf6833aa8573ac7a8f080 100644 (file)
--- a/src/libsystemd-network/test-acd.c
+++ b/src/libsystemd-network/test-acd.c
@@ -19,21 +19,21 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include <linux/veth.h>
 #include <net/if.h>
 
 #include "sd-event.h"
-#include "sd-netlink.h"
 #include "sd-ipv4acd.h"
+#include "sd-netlink.h"
 
-#include "util.h"
 #include "event-util.h"
-#include "netlink-util.h"
 #include "in-addr-util.h"
+#include "netlink-util.h"
+#include "util.h"
 
 static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) {
         assert_se(acd);

diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index 5b52c1cbb9bb6b0b57c64a2d3eefa3444a3b6dd4..1200a7c251a526aef0189051dfd94a238847e5e5 100644 (file)
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -32,8 +32,8 @@
 #include "dhcp-internal.h"
 #include "dhcp-protocol.h"
 #include "event-util.h"
-#include "util.h"
 #include "fd-util.h"
+#include "util.h"
 
 static uint8_t mac_addr[] = {'A', 'B', 'C', '1', '2', '3'};
 

diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c
index 2d29e28f16885219399717fefbd3cf1d3dff4291..3607df63af99814cc793deebe67bdb6f8ded179c 100644 (file)
--- a/src/libsystemd-network/test-dhcp-option.c
+++ b/src/libsystemd-network/test-dhcp-option.c
@@ -1,8 +1,8 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#include <stdio.h>
-#include <stdbool.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "alloc-util.h"

diff --git a/src/libsystemd/sd-bus/bus-bloom.c b/src/libsystemd/sd-bus/bus-bloom.c
index a592ff50cfd28ea7523814f7c637a6b8c4c6b8f7..43668e37ee979893b3727c502fd0af3b56914434 100644 (file)
--- a/src/libsystemd/sd-bus/bus-bloom.c
+++ b/src/libsystemd/sd-bus/bus-bloom.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
-#include "siphash24.h"
 #include "bus-bloom.h"
+#include "siphash24.h"
+#include "util.h"
 
 static inline void set_bit(uint64_t filter[], unsigned long b) {
         filter[b >> 6] |= 1ULL << (b & 63);

diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c
index 52f8dfd3bebfd51a60ab6a4a047fb679ccae7d1c..8d486fcbbdd62a3297df74f9490bbe8ba4366c9e 100644 (file)
--- a/src/libsystemd/sd-bus/bus-common-errors.c
+++ b/src/libsystemd/sd-bus/bus-common-errors.c
@@ -22,8 +22,9 @@
 #include <errno.h>
 
 #include "sd-bus.h"
-#include "bus-error.h"
+
 #include "bus-common-errors.h"
+#include "bus-error.h"
 
 BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = {
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_UNIT,                 ENOENT),

diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
index 589a90bbfff246bbdf20512944662552dbc8bd72..7da6ba990382f4da5e86a8545920d50f51a306ef 100644 (file)
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "bus-container.h"
 #include "bus-internal.h"

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index ddd3a55b6c987b068e892bf170af9215d35a6d74..94251fe87c018bf2313d766c2878aa1c1709d952 100644 (file)
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -23,8 +23,8 @@
 #include <valgrind/memcheck.h>
 #endif
 
-#include <stddef.h>
 #include <errno.h>
+#include <stddef.h>
 
 #include "sd-bus.h"
 

diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 239d7245e6eca00df859b4533fdde5bc2352bfc1..404eaa3c895bbb65aa8d3071e3276b02219d0223 100644 (file)
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -29,10 +29,10 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "bus-error.h"
 #include "errno-list.h"
 #include "string-util.h"
 #include "util.h"
-#include "bus-error.h"
 
 BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed",                           EACCES),

diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c
index 402d43d66d7221eb2b78ae6907b5f2e88c3beb16..ec027590b206c50f553ab4fa259125ad4b72cf98 100644 (file)
--- a/src/libsystemd/sd-bus/bus-gvariant.c
+++ b/src/libsystemd/sd-bus/bus-gvariant.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-type.h"
 #include "bus-gvariant.h"
 #include "bus-signature.h"
+#include "bus-type.h"
 
 int bus_gvariant_get_size(const char *signature) {
         const char *p;

diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index 8c472626a869eef9cad306e3df7f5d5241a3fcd9..303e49fa847174c931c96a7b4c68d34e70cab1a9 100644 (file)
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -23,6 +23,7 @@
 #include "bus-internal.h"
 #include "bus-introspect.h"
 #include "bus-message.h"
+#include "bus-objects.h"
 #include "bus-signature.h"
 #include "bus-slot.h"
 #include "bus-type.h"
@@ -30,7 +31,6 @@
 #include "set.h"
 #include "string-util.h"
 #include "strv.h"
-#include "bus-objects.h"
 
 static int node_vtable_get_userdata(
                 sd_bus *bus,

diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c
index 550bad27ba689e36f42efce34056c43181498a2e..e405a04c53d5a50adb2bb8f4c09876abd7c024d0 100644 (file)
--- a/src/libsystemd/sd-bus/bus-slot.c
+++ b/src/libsystemd/sd-bus/bus-slot.c
@@ -24,8 +24,8 @@
 #include "alloc-util.h"
 #include "bus-control.h"
 #include "bus-objects.h"
-#include "string-util.h"
 #include "bus-slot.h"
+#include "string-util.h"
 
 sd_bus_slot *bus_slot_allocate(
                 sd_bus *bus,

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index a8d79b01b0428eb58ba88ae3dd0d88f216692379..99780c8cceb97e804f50bd65e1a656ca4e77f1cc 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -20,12 +20,12 @@
 ***/
 
 #include <endian.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <netdb.h>
 #include <poll.h>
-#include <sys/mman.h>
 #include <pthread.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+#include <unistd.h>
 
 #include "sd-bus.h"
 
@@ -46,10 +46,10 @@
 #include "cgroup-util.h"
 #include "def.h"
 #include "fd-util.h"
+#include "hexdecoct.h"
 #include "hostname-util.h"
 #include "macro.h"
 #include "missing.h"
-#include "hexdecoct.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 767aef63ffe0755c81caa70f2fe459d8847e399a..f20eced4ac438261211fb4a4ca38eae2cce53dbe 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
+#include <fcntl.h>
 #include <pthread.h>
+#include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include "sd-bus.h"
 
@@ -31,11 +31,11 @@
 #include "bus-internal.h"
 #include "bus-match.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"
-#include "fd-util.h"
 
 static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));

diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c
index 580117165a17bfa1d5a804c695ceacd5179b7147..bd0101af9e2d8a22ddf6900f3285fd762e4e5437 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/sd-bus/test-bus-creds.c
@@ -20,6 +20,7 @@
 ***/
 
 #include "sd-bus.h"
+
 #include "bus-dump.h"
 #include "bus-util.h"
 #include "cgroup-util.h"

diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
index 5753c04b0e818dac8e9a69fe3818a02cf9744e25..9d6c221eb0a79413ab7702d1759bac277c810fc5 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libsystemd/sd-bus/test-bus-error.c
@@ -20,10 +20,11 @@
 ***/
 
 #include "sd-bus.h"
+
+#include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "errno-list.h"
-#include "bus-common-errors.h"
 
 static void test_error(void) {
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL;

diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c
index f39dedeb24a565f0f09671cc8564f087a147edac..26ba16d119a454c4d01a5b90775f7c90984f005c 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/sd-bus/test-bus-introspect.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "log.h"
 #include "bus-introspect.h"
+#include "log.h"
 
 static int prop_get(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
         return -EINVAL;

diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c
index 0747d6a37cb1a4fdedfd5a2bbe5650f93e00da78..0a6093e78be8137d7da7cb1b4e1d95e4eda3223e 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/sd-bus/test-bus-marshal.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
 #include <math.h>
+#include <stdlib.h>
 
 #ifdef HAVE_GLIB
 #include <gio/gio.h>
@@ -38,8 +38,8 @@
 #include "bus-message.h"
 #include "bus-util.h"
 #include "fd-util.h"
-#include "log.h"
 #include "hexdecoct.h"
+#include "log.h"
 #include "util.h"
 
 static void test_bus_path_encode_unique(void) {

diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c
index 75ea28371bf250eb5f4699e967d85c905287c40f..94896c196a3a796ecc2d83efc03c5e60645fb5b0 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libsystemd/sd-bus/test-bus-match.c
@@ -19,13 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "log.h"
-#include "macro.h"
-
 #include "bus-match.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "bus-slot.h"
+#include "bus-util.h"
+#include "log.h"
+#include "macro.h"
 
 static bool mask[32];
 

diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index 5bc72e2355d6269cf418d952801f0de2173b32ad..edd63f9ea73c91dbbd19bf672f0866d2903ff1ea 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
 #include <pthread.h>
+#include <stdlib.h>
 
 #include "sd-bus.h"
 

diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c
index 92a810a7d8d52d0f33fc2301b712a3c493629dfb..949d16e6e972f11c1b8e45094f7c72b08a89a6f6 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/sd-bus/test-bus-signature.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "string-util.h"
-#include "log.h"
-#include "bus-signature.h"
 #include "bus-internal.h"
+#include "bus-signature.h"
+#include "log.h"
+#include "string-util.h"
 
 int main(int argc, char *argv[]) {
         char prefix[256];

diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c
index ff8df61a9e6cb2c98fd64ec5181414903a713a22..1cf8416fa4f3bb7d08272fd0361286e24fc8a7ed 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c
@@ -27,11 +27,11 @@
 #include "bus-dump.h"
 #include "bus-kernel.h"
 #include "bus-message.h"
+#include "fd-util.h"
 #include "log.h"
 #include "memfd-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "fd-util.h"
 
 #define FIRST_ARRAY 17
 #define SECOND_ARRAY 33

diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index 1e17ea6a063e46e8f57f64477b907080d8964e3c..c12bb1e20beb242c8206010fe46c9ceac39d6e89 100644 (file)
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -26,9 +26,9 @@
 #include "sd-id128.h"
 
 #include "fd-util.h"
+#include "hexdecoct.h"
 #include "io-util.h"
 #include "macro.h"
-#include "hexdecoct.h"
 #include "random-util.h"
 #include "util.h"
 

diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/libsystemd/sd-netlink/local-addresses.c
index a00865b56bd4cdadbf654ac5b985ee92caffddea..d431ba4be4d1d664ccc2e9004f29a39e6d3d7a37 100644 (file)
--- a/src/libsystemd/sd-netlink/local-addresses.c
+++ b/src/libsystemd/sd-netlink/local-addresses.c
@@ -23,9 +23,9 @@
 #include "sd-netlink.h"
 
 #include "alloc-util.h"
-#include "netlink-util.h"
-#include "macro.h"
 #include "local-addresses.h"
+#include "macro.h"
+#include "netlink-util.h"
 
 static int address_compare(const void *_a, const void *_b) {
         const struct local_address *a = _a, *b = _b;

diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/sd-netlink/netlink-util.c
index 6f9fd2993b1bd6a257a2d26200f45fac86665913..95690b7ff1244f77cc20c8ec5d13cbe23133b2d8 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-util.c
+++ b/src/libsystemd/sd-netlink/netlink-util.c
@@ -21,8 +21,8 @@
 
 #include "sd-netlink.h"
 
-#include "netlink-util.h"
 #include "netlink-internal.h"
+#include "netlink-util.h"
 
 int rtnl_set_link_name(sd_netlink **rtnl, int ifindex, const char *name) {
         _cleanup_netlink_message_unref_ sd_netlink_message *message = NULL;

diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/libsystemd/sd-netlink/test-local-addresses.c
index 71801759700a91ed49a3d7f84bc89dd97a8f8c6d..0b53297ab80db5675f1f0fb121e5629b28025642 100644 (file)
--- a/src/libsystemd/sd-netlink/test-local-addresses.c
+++ b/src/libsystemd/sd-netlink/test-local-addresses.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "af-list.h"
 #include "alloc-util.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"
-#include "af-list.h"
 
 static void print_local_addresses(struct local_address *a, unsigned n) {
         unsigned i;

diff --git a/src/libsystemd/sd-utf8/sd-utf8.c b/src/libsystemd/sd-utf8/sd-utf8.c
index 381397cc5208905904935a5c316a1e92874ace71..9e52db3b3dd6b2fa1d10bae933e642b7f1d61ef2 100644 (file)
--- a/src/libsystemd/sd-utf8/sd-utf8.c
+++ b/src/libsystemd/sd-utf8/sd-utf8.c
@@ -21,8 +21,8 @@
 
 #include "sd-utf8.h"
 
-#include "util.h"
 #include "utf8.h"
+#include "util.h"
 
 _public_ const char *sd_utf8_is_valid(const char *s) {
         assert_return(s, NULL);

diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index 2d3e62410c5724a3e2684bf890912c577dbfcbf7..fa4e3a2b1e79a3a0fbeb3b9fabe9b82c727ba621 100644 (file)
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -18,11 +18,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "libudev.h"
-
 #include "device-private.h"
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
+#include "libudev.h"
 
 int udev_device_tag_index(struct udev_device *udev_device, struct udev_device *udev_device_old, bool add) {
         sd_device *device_old = NULL;

diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 814e016800cff82f7a373fe2c5f826b55be6b2b5..b17ecd870d655cd353e29fb2945d0ca9d4552024 100644 (file)
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -34,7 +34,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "libudev.h"
 #include "sd-device.h"
 
 #include "alloc-util.h"
@@ -42,6 +41,7 @@
 #include "device-util.h"
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
+#include "libudev.h"
 #include "parse-util.h"
 
 /**

diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 442f9615f2d4310a4eabc5b612d9926e256ebad3..f15b099ad1c5b2852335de1dffd6fd2e35b17bed 100644 (file)
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -28,13 +28,13 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "libudev.h"
 #include "sd-device.h"
 
 #include "alloc-util.h"
 #include "device-enumerator-private.h"
 #include "device-util.h"
 #include "libudev-device-internal.h"
+#include "libudev.h"
 
 /**
  * SECTION:libudev-enumerate

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index f870eba9eb2715a24d0e47986d7d095cc8f3d873..f1ef4ac96fb06eecc2b3e50d48e26110a2601e87 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -28,13 +28,12 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "libudev-private.h"
+#include "libudev.h"
 #include "missing.h"
 #include "mount-util.h"
 #include "socket-util.h"

diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index 58410b1b8fea79f5873cf26ae96bcf47890b4cc1..e3dffa6925fe0aba3b478445bd83dfcdeaa500a7 100644 (file)
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -18,11 +18,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
 #include <errno.h>
+#include <stddef.h>
+#include <stdlib.h>
 #include <sys/inotify.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"

diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 574cfeac85684dd9bdafb12f6fd8b861b81434b6..4a75980b1fd5d8080aa2d7be3d5212c1110b31e9 100644 (file)
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -24,11 +24,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "MurmurHash2.h"
 #include "device-nodes.h"
 #include "libudev-private.h"
+#include "libudev.h"
 #include "syslog-util.h"
 #include "utf8.h"
 

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 63fb05547dee4e1c59ce30749ea7574968fb2fd8..3f76dd817136f47317e312aba0b501eea6120697 100644 (file)
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -24,11 +24,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libudev.h"
-
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "libudev-private.h"
+#include "libudev.h"
 #include "missing.h"
 #include "string-util.h"
 

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 38c426c1aae090b4b9a413366d37899c2a22f842..36cdbbe0f9296b89f40720b4c64c3a83f4fd44f8 100644 (file)
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
 #include <linux/vt.h>
 
 #include "alloc-util.h"

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 9bf3ca0995530eca91c25aedcf911416f31fe8a1..0c6983d73ae15de15d671d694171a94cb237e579 100644 (file)
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -25,11 +25,10 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-#include "libudev.h"
-
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "fd-util.h"
+#include "libudev.h"
 #include "logind-session-device.h"
 #include "missing.h"
 #include "util.h"

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 6c4ada29fbeb8f493ea790f14eac384fa69b6988..9f03a7b31e348c33d935b1caff5046a0eee1efee 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -36,7 +36,6 @@
 #include "bus-util.h"
 #include "escape.h"
 #include "fd-util.h"
-#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "io-util.h"

diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 3e7a935a34a42d04343bdeab8bb439563e8d98eb..3bd61a81fd5379a24c06565589f2118bac3316fb 100644 (file)
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -20,9 +20,9 @@
 ***/
 
 #include <errno.h>
+#include <pwd.h>
 #include <string.h>
 #include <unistd.h>
-#include <pwd.h>
 
 #include "sd-messages.h"
 

diff --git a/src/login/logind.c b/src/login/logind.c
index 7b41174c64b2f84b723bfae6312b4f3a4314028c..04f467ceb4d1b006130f8bd3482beb387fd1c1d3 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libudev.h"
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
@@ -35,6 +34,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "formats-util.h"
+#include "libudev.h"
 #include "logind.h"
 #include "signal-util.h"
 #include "strv.h"

diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index e9ca4bb03d0d15cdb0c02a14eeeffedd6d1087af..86acee5751dfaf8c115f9268b5adc8fee8257cab 100644 (file)
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -22,9 +22,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include "libudev.h"
-
 #include "alloc-util.h"
+#include "libudev.h"
 #include "locale-util.h"
 #include "path-util.h"
 #include "string-util.h"

diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c
index 4c4275d1245eaf8c00cb75f257e332c3bf002d5f..ac327f71fb2b0992b3cc78ffd29cce3029c5dbd1 100644 (file)
--- a/src/login/test-login-shared.c
+++ b/src/login/test-login-shared.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
 #include "login-util.h"
+#include "macro.h"
 
 static void test_session_id_valid(void) {
         assert_se(session_id_valid("c1"));

diff --git a/src/login/test-login-tables.c b/src/login/test-login-tables.c
index a4196bf14b3a6fb8610994be41332059324e9fea..4fbc893a9a0ae7d90cac44945dfa7d0bd4daed67 100644 (file)
--- a/src/login/test-login-tables.c
+++ b/src/login/test-login-tables.c
@@ -19,7 +19,6 @@
 
 #include "logind-action.h"
 #include "logind-session.h"
-
 #include "test-tables.h"
 
 int main(int argc, char **argv) {

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index f1165ea09ca4739edde7b8a4856c5b3e8e21cdd7..d805bcfdca7d837d9515d5b400400377da5f4be6 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -26,8 +26,8 @@
 
 #include "log.h"
 #include "machine-id-setup.h"
-#include "util.h"
 #include "path-util.h"
+#include "util.h"
 
 static char *arg_root = NULL;
 static bool arg_commit = false;

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 196bc4b8f4ff417dc3c4dd89ccb0e9d0df91f7b8..282079f228e9fbec9c969f3bbad89b3270ab9994 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -29,6 +29,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
@@ -42,7 +43,6 @@
 #include "terminal-util.h"
 #include "unit-name.h"
 #include "util.h"
-#include "extract-word.h"
 
 Machine* machine_new(Manager *manager, MachineClass class, const char *name) {
         Machine *m;

diff --git a/src/machine/test-machine-tables.c b/src/machine/test-machine-tables.c
index 4aae426050db8bac25e2d68932fd672377c460c0..f851a4d37d8c897b48c4432bb383c0d79f8742c8 100644 (file)
--- a/src/machine/test-machine-tables.c
+++ b/src/machine/test-machine-tables.c
@@ -18,7 +18,6 @@
 ***/
 
 #include "machine.h"
-
 #include "test-tables.h"
 
 int main(int argc, char **argv) {

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 446b048ef1b0ba7369f10ff488d03b8f7e8194c2..6fcb3050c778309f03c48bb6584a42b06fdda390 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -36,7 +36,6 @@
 #include "lldp.h"
 #include "local-addresses.h"
 #include "locale-util.h"
-#include "locale-util.h"
 #include "netlink-util.h"
 #include "pager.h"
 #include "parse-util.h"

diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index c9222b8cb8ec5f936fe87acab1bc0f8503e77ca3..6e5480ee220bdc0b4f30e750c7c8af59a941b501 100644 (file)
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <net/if.h>
 #include <net/ethernet.h>
+#include <net/if.h>
 
 #include "alloc-util.h"
 #include "conf-parser.h"

diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 506654b5d7cbf3e6a62ebbddaca2f5b10c3c7dda..f4aac4bb932e8afcb4fb6c83ac2b4fd86bde9fa1 100644 (file)
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -22,8 +22,8 @@
 #include <netinet/ether.h>
 #include <linux/if.h>
 
-#include "networkd-link.h"
 #include "network-internal.h"
+#include "networkd-link.h"
 
 static int ipv4ll_address_lost(Link *link) {
         _cleanup_address_free_ Address *address = NULL;

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 11b35d6cf804c9f7859f387b670aed9cd8f623fa..d09a3c2d07d1e38a85f6f6acde59143dfcb0ecfd 100644 (file)
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -19,13 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
-#include "strv.h"
-
 #include "alloc-util.h"
+#include "bus-util.h"
 #include "networkd-link.h"
 #include "networkd.h"
 #include "parse-util.h"
+#include "strv.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_administrative_state, link_state, LinkState);

diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c
index 4e4755f86f92fb1e984dfae7f1834b34876287d8..50b9021d0952bf043db06f85dc8b689b51d4a248 100644 (file)
--- a/src/network/networkd-netdev-bond.c
+++ b/src/network/networkd-netdev-bond.c
@@ -29,8 +29,8 @@
 #include "conf-parser.h"
 #include "missing.h"
 #include "networkd-netdev-bond.h"
-#include "string-util.h"
 #include "string-table.h"
+#include "string-util.h"
 
 /*
  * Number of seconds between instances where the bonding

diff --git a/src/network/networkd-netdev-bridge.c b/src/network/networkd-netdev-bridge.c
index 57c58d83b4c33bfffe3ebbc2a1d101566e194015..a991bdb5fbac19fbc15d0973c81ffdd0fcb8005c 100644 (file)
--- a/src/network/networkd-netdev-bridge.c
+++ b/src/network/networkd-netdev-bridge.c
@@ -22,9 +22,9 @@
 
 #include <net/if.h>
 
-#include "networkd-netdev-bridge.h"
 #include "missing.h"
 #include "netlink-util.h"
+#include "networkd-netdev-bridge.h"
 
 /* callback for brige netdev's parameter set */
 static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {

diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/networkd-netdev-tuntap.c
index 851e83537e7cf66964ebe0a78f81f5898089c95e..3d504a85644570df00b69036080c07dcf7027ca7 100644 (file)
--- a/src/network/networkd-netdev-tuntap.c
+++ b/src/network/networkd-netdev-tuntap.c
@@ -19,8 +19,8 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/ioctl.h>
 #include <net/if.h>
+#include <sys/ioctl.h>
 #include <linux/if_tun.h>
 
 #include "alloc-util.h"

diff --git a/src/network/networkd-netdev-veth.c b/src/network/networkd-netdev-veth.c
index bee1a167263379701dacacb8209792c3dac93854..773a1ee6d186855838b309a465a3ccedcf5b8339 100644 (file)
--- a/src/network/networkd-netdev-veth.c
+++ b/src/network/networkd-netdev-veth.c
@@ -23,6 +23,7 @@
 #include <linux/veth.h>
 
 #include "sd-netlink.h"
+
 #include "networkd-netdev-veth.h"
 
 static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {

diff --git a/src/network/networkd-netdev-vxlan.c b/src/network/networkd-netdev-vxlan.c
index 755ad2f9347485c644175b77c2500f89d95def8e..7932b93335f259711f2167155b3d807051255106 100644 (file)
--- a/src/network/networkd-netdev-vxlan.c
+++ b/src/network/networkd-netdev-vxlan.c
@@ -22,10 +22,11 @@
 #include <net/if.h>
 
 #include "sd-netlink.h"
-#include "networkd-netdev-vxlan.h"
-#include "networkd-link.h"
+
 #include "conf-parser.h"
 #include "missing.h"
+#include "networkd-link.h"
+#include "networkd-netdev-vxlan.h"
 
 static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
         VxLan *v;

diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
index 438214015d840144976765d0b2bff19375eab947..ecbbe6c3c9f65a1cc6559080bee4c1bbc779b820 100644 (file)
--- a/src/network/test-network-tables.c
+++ b/src/network/test-network-tables.c
@@ -1,11 +1,10 @@
-#include "networkd.h"
-#include "networkd-netdev-bond.h"
-#include "networkd-netdev-macvlan.h"
 #include "dhcp6-internal.h"
 #include "dhcp6-protocol.h"
-#include "netlink-internal.h"
 #include "ethtool-util.h"
-
+#include "netlink-internal.h"
+#include "networkd-netdev-bond.h"
+#include "networkd-netdev-macvlan.h"
+#include "networkd.h"
 #include "test-tables.h"
 
 int main(int argc, char **argv) {

diff --git a/src/network/test-network.c b/src/network/test-network.c
index dbed3795e3ffca16cf57243d808eae1fe6abee90..a1a77b68677dbdaea46de7c2779d218727a033ac 100644 (file)
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -20,9 +20,9 @@
 ***/
 
 #include "alloc-util.h"
-#include "networkd.h"
-#include "network-internal.h"
 #include "dhcp-lease-internal.h"
+#include "network-internal.h"
+#include "networkd.h"
 
 static void test_deserialize_in_addr(void) {
         _cleanup_free_ struct in_addr *addresses = NULL;

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 92dfb945e00f8d45b6bc96f59663c68f450dc56f..04d8da3bc8aea26d3d48d280e4d383a80f56b6f6 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -22,18 +22,18 @@
 #include <linux/veth.h>
 #include <net/if.h>
 
-#include "libudev.h"
 #include "sd-id128.h"
 #include "sd-netlink.h"
 
 #include "alloc-util.h"
 #include "ether-addr-util.h"
+#include "libudev.h"
 #include "netlink-util.h"
+#include "nspawn-network.h"
 #include "siphash24.h"
 #include "string-util.h"
 #include "udev-util.h"
 #include "util.h"
-#include "nspawn-network.h"
 
 #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1)
 #define CONTAINER_HASH_KEY SD_ID128_MAKE(c3,c4,f9,19,b5,57,b2,1c,e6,cf,14,27,03,9c,ee,a2)

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index dc2911e4e8b2558b8f779462838eb8f95be5ef60..883d96608d4bba84ba5f815ad2095ccc5203cb06 100644 (file)
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -25,11 +25,11 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
+#include "proc-cmdline.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "proc-cmdline.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 57f99c9ef0cc83c17f7b7a0361d3a45278f3ea63..b155f991bb6ad8c7f3dca74a73832eb4d9073343 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -19,12 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <errno.h>
+#include <mntent.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <mntent.h>
+#include <unistd.h>
 
 #include "exit-status.h"
 #include "log.h"

diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c
index 432e62dd9f8efd0177bd3345dae10ae18c151d2d..eb4e646846bd081fa493f652baad126b35769353 100644 (file)
--- a/src/resolve-host/resolve-host.c
+++ b/src/resolve-host/resolve-host.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <net/if.h>
 #include <getopt.h>
+#include <net/if.h>
 
 #include "sd-bus.h"
 

diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c
index 5c3a4a00c30a446a7365863a5cda9fafb7487694..6a7ff9d24589329ce5d85d811502dce74d7907fa 100644 (file)
--- a/src/resolve/resolved-llmnr.c
+++ b/src/resolve/resolved-llmnr.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include <resolv.h>
 #include <netinet/in.h>
+#include <resolv.h>
 
 #include "fd-util.h"
 #include "resolved-llmnr.h"

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 5c45a3ae6c519d17f2edb290c0e2faaea6ce16c3..45a41ccd336e2706612d434f04ae77230c338a04 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -22,7 +22,6 @@
 #include <linux/rfkill.h>
 #include <poll.h>
 
-#include "libudev.h"
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
@@ -30,6 +29,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "io-util.h"
+#include "libudev.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"

diff --git a/src/run/run.c b/src/run/run.c
index 38a482bb117a23e6f3a0f59869907fccf76bde82..df6a4f0074a147de12318d2f6a9dc1c1fa56f543 100644 (file)
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -33,6 +33,7 @@
 #include "event-util.h"
 #include "fd-util.h"
 #include "formats-util.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "ptyfwd.h"
 #include "signal-util.h"
@@ -41,7 +42,6 @@
 #include "terminal-util.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "parse-util.h"
 
 static bool arg_ask_password = true;
 static bool arg_scope = false;

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 79f5a605796ad3688f4358fe65920b9c7c2677cf..35f2e1b67dd390adaea047eebae21478d64c8a6a 100644 (file)
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -22,8 +22,8 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "alloc-util.h"
 #include "acl-util.h"
+#include "alloc-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"

diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
index 8e36067f7458af1d0becf3b277c42a58fbbeec18..30e03c0652f4f1692ea10e283356885683e453fc 100644 (file)
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
 #include "acpi-fpdt.h"
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "time-util.h"

diff --git a/src/shared/architecture.c b/src/shared/architecture.c
index e2efa4272b7c556f46f385169a2ed0a5329e312d..73937bd5a7f8d8e131854039e7e342f9c341be27 100644 (file)
--- a/src/shared/architecture.c
+++ b/src/shared/architecture.c
@@ -21,9 +21,9 @@
 
 #include <sys/utsname.h>
 
+#include "architecture.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "architecture.h"
 
 int uname_architecture(void) {
 

diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
index ecbe1aaa0f9eed0e931cc8b0abf487f162da3e8f..879aca93744de074b709727ae3906735eba329f2 100644 (file)
--- a/src/shared/boot-timestamps.c
+++ b/src/shared/boot-timestamps.c
@@ -20,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "boot-timestamps.h"
 #include "acpi-fpdt.h"
+#include "boot-timestamps.h"
 #include "efivars.h"
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) {

diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 835fe524234dd9f5100eff20990ee5eba4a9a310..71cc613704cd99fbbc4a00dc73b479b5b2491ec6 100644 (file)
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -29,13 +29,13 @@
 #include <sys/stat.h>
 
 #include "clean-ipc.h"
+#include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "dirent-util.h"
 
 static int clean_sysvipc_shm(uid_t delete_uid) {
         _cleanup_fclose_ FILE *f = NULL;

diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 86bb0b57c3d61227be98e3361783c4703bcc5ada..89deeb9b550137001ebb8a61b799a3bd7ae90c90 100644 (file)
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
-#include <string.h>
 #include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "dirent-util.h"

diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index e1782878726cc95a54b54d4962f91294919e468a..5acfb0191b45e7323511e1e294c072fd066b6b0b 100644 (file)
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/types.h>
 #include <arpa/inet.h>
 #include <net/if.h>
+#include <sys/types.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter/nf_nat.h>
 #include <linux/netfilter/xt_addrtype.h>

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index d71f379e76732b4a74d208b3ccfe15a7c8baf38e..4a82bd18cde3ca86ec6e60bb831b96b9f337a35b 100644 (file)
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -19,18 +19,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
+#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #include "alloc-util.h"
-#include "util.h"
-#include "strv.h"
-#include "path-util.h"
 #include "install.h"
-#include "string-util.h"
 #include "path-lookup.h"
+#include "path-util.h"
+#include "string-util.h"
+#include "strv.h"
+#include "util.h"
 
 int user_config_home(char **config_home) {
         const char *e;

diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 63e81f489490ed3af4bb8902ed8a754799815c31..2666b8f7e22ffb7fac8f63d1d364fd6ddff58d88 100644 (file)
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <limits.h>
 #include <sys/epoll.h>
 #include <sys/ioctl.h>
-#include <limits.h>
 #include <termios.h>
 
 #include "alloc-util.h"

diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index c518cf83ec4084a6885c5e3fe07336d0efcd5e08..09baf51661c3ba5efa5421d89d418304d552751b 100644 (file)
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -21,9 +21,9 @@
 
 #include <seccomp.h>
 
+#include "seccomp-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "seccomp-util.h"
 
 const char* seccomp_arch_to_string(uint32_t c) {
 

diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index 29db855c677ec595b080e5579607721b1b3cfeed..3fcea61873bc0eb2a6ff35e61ae43bae3ab22a7d 100644 (file)
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -25,8 +25,8 @@
 
 #include "log.h"
 #include "process-util.h"
-#include "util.h"
 #include "spawn-ask-password-agent.h"
+#include "util.h"
 
 static pid_t agent_pid = 0;
 

diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index ec6e5a8312ea47cd78b4727afc5170a56b373b5a..8ea6cb830bfc7ea9c1b8849a37749b57179cbf1c 100644 (file)
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
 #include <errno.h>
 #include <poll.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "fd-util.h"
 #include "io-util.h"

diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 21cb82ea1cc45bc1800802987b0e4f09dd70b1ed..70caa542e740a6aa047c22650fd0280782b577fd 100644 (file)
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -30,8 +30,8 @@
 #include "fileio.h"
 #include "log.h"
 #include "string-util.h"
-#include "util.h"
 #include "sysctl-util.h"
+#include "util.h"
 
 char *sysctl_normalize(char *s) {
         char *n;

diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index d58f9873d507f82e1f71f04a84d0084530ae2d6f..7131e94cdb77789b384382c7c0265cadfaf3a98f 100644 (file)
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -19,15 +19,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/ioctl.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
 #include <unistd.h>
 #include <linux/watchdog.h>
 
-#include "watchdog.h"
-#include "log.h"
 #include "fd-util.h"
+#include "log.h"
+#include "watchdog.h"
 
 static int watchdog_fd = -1;
 static usec_t watchdog_timeout = USEC_INFINITY;

diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index a5b66a7d2f2171337ae66ec18736aa97a96e71df..35479d67c1c796d9822f0fab5431108480977406 100644 (file)
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "virt.h"
 #include "architecture.h"
-#include "util.h"
 #include "log.h"
+#include "util.h"
+#include "virt.h"
 
 int main(int argc, char *argv[]) {
         int a, v;

diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index 06d93af5332a8d17f7c0b0a11f4fa167d2b75677..fab33d20c7db543262c33a512146a3b5c1365d18 100644 (file)
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -20,11 +20,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
-#include "log.h"
+#include "acpi-fpdt.h"
 #include "boot-timestamps.h"
 #include "efivars.h"
-#include "acpi-fpdt.h"
+#include "log.h"
+#include "util.h"
 
 static int test_acpi_fpdt(void) {
         usec_t loader_start;

diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 85b0d607d63a87212f8645a50b8d4d74940b705d..27460135226a1c9862e2eb4f8fc7f0550ff5915f 100644 (file)
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -21,10 +21,10 @@
 
 #include <stdio.h>
 
-#include "manager.h"
-#include "unit.h"
 #include "macro.h"
+#include "manager.h"
 #include "test-helper.h"
+#include "unit.h"
 
 static int test_cgroup_mask(void) {
         Manager *m = NULL;

diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 954ed0d9e076b3c248851b26a100a90b28935447..4f14c587883d5c2de1763c09d1ad9915cebacf19 100644 (file)
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -19,12 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
 #include <string.h>
 
-#include "manager.h"
 #include "bus-util.h"
+#include "manager.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_bus_error_free_ sd_bus_error err = SD_BUS_ERROR_NULL;

diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index bde3c7c3cfc78d7a500f14882b5b1dc2ab2d935f..871c71e171a9758fd7f95ad29e20ea253003d6be 100644 (file)
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
index d636e427c4d381423131417875d3e5ad4e9f32fa..ff66bde094712c0303e43704902c9d15cccb2138 100644 (file)
--- a/src/test/test-firewall-util.c
+++ b/src/test/test-firewall-util.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "log.h"
 #include "firewall-util.h"
+#include "log.h"
 
 #define MAKE_IN_ADDR_UNION(a,b,c,d) (union in_addr_union) { .in.s_addr = htobe32((uint32_t) (a) << 24 | (uint32_t) (b) << 16 | (uint32_t) (c) << 8 | (uint32_t) (d))}
 

diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index d0e65001f52860a13405a555a94eb9b0e2122d81..83cea360e699b2a0fd9972bedff74a7fa640f8fa 100644 (file)
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
 #include "hashmap.h"
+#include "util.h"
 
 void test_hashmap_funcs(void);
 void test_ordered_hashmap_funcs(void);

diff --git a/src/test/test-install.c b/src/test/test-install.c
index 359b2623476614683a2bddcf96d40018bf193e78..ef6f1efb896417a8e499f1dc8fa7b594c84723d7 100644 (file)
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "install.h"
 

diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c
index af0d76e8947463a9176605981aad523085d33774..75ce3a349e3ef71f712716266fb50848de5fa742 100644 (file)
--- a/src/test/test-job-type.c
+++ b/src/test/test-job-type.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 
 #include "job.h"
-#include "unit.h"
 #include "service.h"
+#include "unit.h"
 
 int main(int argc, char*argv[]) {
         JobType a, b, c, ab, bc, ab_c, bc_a, a_bc;

diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 350eaf734dd1d040829707aea5aafd06e0c452c6..422926ef456fb9b134b24a59a0b5967bbb34a90f 100644 (file)
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 
 #include "libudev.h"
-
 #include "string-util.h"
 #include "udev-util.h"
 #include "util.h"

diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index 97650753657da5eeef7f35b6c5fa30311a461386..427c698d1d0cb2a1829122d58226fb6cd7d9be56 100644 (file)
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -19,8 +19,8 @@
 
 
 #include "locale-util.h"
-#include "strv.h"
 #include "macro.h"
+#include "strv.h"
 
 static void test_get_locales(void) {
         _cleanup_strv_free_ char **locales = NULL;

diff --git a/src/test/test-log.c b/src/test/test-log.c
index 9dcfa2f2748edd47f1452d2ac0eea13b2d9c6a8c..a01df9b04929ee75db1aaf44a0521f2e63e3d982 100644 (file)
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -22,9 +22,9 @@
 #include <stddef.h>
 #include <unistd.h>
 
+#include "formats-util.h"
 #include "log.h"
 #include "util.h"
-#include "formats-util.h"
 
 int main(int argc, char* argv[]) {
 

diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index e3e5a95add29c597e024f20e4b0571bafd52f8e3..556938a0f897060ff748be6c850b1e8f9e6dff7e 100644 (file)
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "loopback-setup.h"
 #include "log.h"
+#include "loopback-setup.h"
 
 int main(int argc, char* argv[]) {
         int r;

diff --git a/src/test/test-ns.c b/src/test/test-ns.c
index 3050be9e9d17fc1723a88271116234fed63509a7..1175114a3a9911202b02081a7d4151d56792a20d 100644 (file)
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "namespace.h"
 #include "log.h"
+#include "namespace.h"
 
 int main(int argc, char *argv[]) {
         const char * const writable[] = {

diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c
index 462b55cdb3dcf59eaf769552ac48f9c82789fb1b..990b834c79abfa9dee8afa4cba6765ca3c328213 100644 (file)
--- a/src/test/test-ratelimit.c
+++ b/src/test/test-ratelimit.c
@@ -19,9 +19,9 @@
 
 #include <unistd.h>
 
+#include "macro.h"
 #include "ratelimit.h"
 #include "time-util.h"
-#include "macro.h"
 
 static void test_ratelimit_test(void) {
         int i;

diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index ebc9110c4d700d35b6706db55f59b44431568dce..8396ae60f3de0c0860fb78d5522ae8af15a9edc7 100644 (file)
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -21,8 +21,8 @@
 
 #include <sched.h>
 
-#include "manager.h"
 #include "macro.h"
+#include "manager.h"
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;

diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c
index 0200e146ad8f5451a33eb171277584febd057371..7e39890110111429b724e6ea8001b8a58b911f75 100644 (file)
--- a/src/test/test-siphash24.c
+++ b/src/test/test-siphash24.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
 #include "siphash24.h"
+#include "util.h"
 
 #define ITERATIONS 10000000ULL
 

diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 4308ddfb64ec5da593b5b2484086a2ce77990bb3..fb115ce4f3e7a7f26337e4a20bc3688a6165e805 100644 (file)
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -21,10 +21,10 @@
 
 #include <stdio.h>
 
-#include "util.h"
 #include "log.h"
 #include "sleep-config.h"
 #include "strv.h"
+#include "util.h"
 
 static void test_sleep(void) {
         _cleanup_strv_free_ char

diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index da27cde3dabfd5735f682a4ad33bbcaf25cfb39f..aef992ee3cccfcc7543bcfb7eb47526a3d336c7a 100644 (file)
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -36,6 +36,7 @@
 #include "logs-show.h"
 #include "mount.h"
 #include "path.h"
+#include "rlimit-util.h"
 #include "scope.h"
 #include "service.h"
 #include "slice.h"
@@ -43,13 +44,11 @@
 #include "socket.h"
 #include "swap.h"
 #include "target.h"
+#include "test-tables.h"
 #include "timer.h"
 #include "unit-name.h"
 #include "unit.h"
 #include "util.h"
-#include "rlimit-util.h"
-
-#include "test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(architecture, ARCHITECTURE);

diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index e940b5a204ce229d00d63d559b9fd6fc0fc60651..84b448a0957a39a62e81d0192204af54d09192bf 100644 (file)
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -18,8 +18,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/test/test-time.c b/src/test/test-time.c
index 820e4aaee25bb3b1c3d16575a35fd813dbbf9bae..8896b2c92bb5fa51c3b7d621b1200f74fbc47f05 100644 (file)
--- a/src/test/test-time.c
+++ b/src/test/test-time.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "time-util.h"
 #include "strv.h"
+#include "time-util.h"
 
 static void test_parse_sec(void) {
         usec_t u;

diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c
index ec52db262cad9bf4005342a20f8ddf6348d211b9..b18b3fca0e264a1eed45599008f5d54c770aef3b 100644 (file)
--- a/src/test/test-unaligned.c
+++ b/src/test/test-unaligned.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "unaligned.h"
 #include "sparse-endian.h"
+#include "unaligned.h"
 #include "util.h"
 
 static uint8_t data[] = {

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index 0af8349732e052d7641356b4d662f01d8f7d7dac..e98be5763ca1edb4706174b30f6c0afaa759d8ef 100644 (file)
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -20,9 +20,9 @@
 ***/
 
 #include "alloc-util.h"
+#include "string-util.h"
 #include "utf8.h"
 #include "util.h"
-#include "string-util.h"
 
 static void test_utf8_is_printable(void) {
         assert_se(utf8_is_printable("ascii is valid\tunicode", 22));

diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index 2e5d0c3aaebfb633784a1504fba8893979f75a30..d10d9f49af35a7a53338771b4980d1aa9b6d079e 100644 (file)
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -21,8 +21,8 @@
 
 #include <unistd.h>
 
-#include "watchdog.h"
 #include "log.h"
+#include "watchdog.h"
 
 int main(int argc, char *argv[]) {
         usec_t t = 10 * USEC_PER_SEC;

diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 1e414664ce74bc12551fef57ad4711d789be522a..be3471013d43debe25d28bc8800744635fe0be3d 100644 (file)
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -37,10 +37,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "fd-util.h"
 #include "libudev-private.h"
+#include "libudev.h"
 #include "log.h"
 #include "udev-util.h"
 

diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index 72f284f71082cf51da598a0da1db88f8c53ed412..3ca576d75b841bcb5db3966c4bc32b230df25791 100644 (file)
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -34,9 +34,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "libudev-private.h"
+#include "libudev.h"
 #include "random-util.h"
 
 /* device info */

diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c
index 67b750c4b36caca1fbcb70a119508090f9ea6f42..462fab7623be99841b9a11d76b8c9e4e0bd880ce 100644 (file)
--- a/src/udev/mtd_probe/mtd_probe.c
+++ b/src/udev/mtd_probe/mtd_probe.c
@@ -17,14 +17,14 @@
  * Boston, MA  02110-1301  USA
  */
 
+#include <fcntl.h>
+#include <mtd/mtd-user.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
-#include <mtd/mtd-user.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <stdlib.h>
 
 #include "mtd_probe.h"
 

diff --git a/src/udev/mtd_probe/probe_smartmedia.c b/src/udev/mtd_probe/probe_smartmedia.c
index a007ccee2fca0e5be7e090acd22b99c5c588d823..6a6c5522a765365cefac3f9acad75d0c8ba537d2 100644 (file)
--- a/src/udev/mtd_probe/probe_smartmedia.c
+++ b/src/udev/mtd_probe/probe_smartmedia.c
@@ -17,15 +17,16 @@
  * Boston, MA  02110-1301  USA
  */
 
+#include <fcntl.h>
+#include <mtd/mtd-user.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <mtd/mtd-user.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <stdint.h>
+
 #include "mtd_probe.h"
 
 static const uint8_t cis_signature[] = {

diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index 46556916429b6352424b34e7e880332003e0ae56..ff16344316c3ff54056df7e0a71f4f4d64730517 100644 (file)
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -29,10 +29,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "fd-util.h"
 #include "libudev-private.h"
+#include "libudev.h"
 #include "scsi_id.h"
 #include "string-util.h"
 #include "udev-util.h"

diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index c7ef783684b88ac8d744dde0bfd89e907df018c6..71a518a4537a882e08cb97aa987ce215af9d535f 100644 (file)
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -33,9 +33,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "libudev.h"
-
 #include "libudev-private.h"
+#include "libudev.h"
 #include "random-util.h"
 #include "scsi.h"
 #include "scsi_id.h"

diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index bbda9de08c13e5508e5c13049df858095377b715..3ebe36f0433c7b1737b10d35fc6643890183f0ce 100644 (file)
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 
 #include "sd-login.h"
 

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 1e05be51a549d6185301755ea74f06e19e2d19a3..962de22f43b1b745632c45f6ddd2ef9ee0e298b5 100644 (file)
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -10,13 +10,13 @@
  */
 
 #include <errno.h>
-#include <stdlib.h>
+#include <poll.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 9aa5ab185d590ef1398a014641499243e6404846..f1fdccaed88417fdb817635de78cd55518ae3f43 100644 (file)
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
-#include <stdio.h>
 #include <dirent.h>
+#include <errno.h>
 #include <stddef.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <sys/inotify.h>
+#include <unistd.h>
 
 #include "udev.h"
 

diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 78170463b6536d1f926bf772565af7ca07c180ad..989decbe9552557b23e798d8a5ba29bf14014cad 100644 (file)
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -13,15 +13,15 @@
  */
 
 #include <errno.h>
+#include <getopt.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 #include <unistd.h>
-#include <getopt.h>
 
-#include "udev.h"
 #include "udev-util.h"
+#include "udev.h"
 
 static void print_help(void) {
         printf("%s control COMMAND\n\n"

diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index 30aa53feb2b08b93100b3a9115e21746109f12c6..f9cb5e63a2497e7e91aa62de382fb2898938feeb 100644 (file)
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -15,15 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
 #include <errno.h>
-#include <signal.h>
 #include <getopt.h>
-#include <time.h>
-#include <sys/time.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/epoll.h>
+#include <sys/time.h>
+#include <time.h>
 
 #include "fd-util.h"
 #include "formats-util.h"

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index c25071b0fee7b718747ab43f7636671af10bece5..6a5dc6e9e442ea396b82bbfff7dbd31a1c6b01e9 100644 (file)
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include <getopt.h>
 #include <poll.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "parse-util.h"
 #include "udev.h"

diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index 607d78a0191e91f7b3370fa0a07e1f7d4f2acd9c..aec6676a33294aafd5b75458fc83e995f0d39ba3 100644 (file)
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -13,17 +13,17 @@
  * General Public License for more details:
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <sys/types.h>
-#include <sys/time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <linux/videodev2.h>
 
 #include "fd-util.h"