Merge pull request #1922 from phomes/sort-includes

Sort includes

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"

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) {
 

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) {
 

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
 

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) {
 

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) {
 

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) {
 

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"

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;

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"
 

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;

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"

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) {
 

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 {

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"

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"

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);

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
 

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"
 

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;

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) {

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"

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"

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);

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

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 } }

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 \

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 {

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];

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];

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 " ####";

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 <time.h>
-#include <limits.h>
-#include <unistd.h>
 #include <sys/utsname.h>
-#include <fcntl.h>
+#include <time.h>
+#include <unistd.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)

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"

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;

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);
 

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);
 

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),

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);
 

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,

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);
 

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),

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,

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),

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"

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;

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"

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(

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,

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"

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;

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"

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 <stdlib.h>
-#include <unistd.h>
 #include <ftw.h>
+#include <stdlib.h>
+#include <sys/mount.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "bus-util.h"

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

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)

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,

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"

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"

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"

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"

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"

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"

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"

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,

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
 

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"
 

src/initctl/initctl.c

@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/epoll.h>
 #include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/epoll.h>
+#include <unistd.h>
 
 #include "sd-bus.h"
 #include "sd-daemon.h"

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"

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;

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"

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;

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"
 

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"

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"

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"

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

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"

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,

src/journal/journald.c

@@ -21,16 +21,15 @@
 
 #include <unistd.h>
 
-#include "sd-messages.h"
 #include "sd-daemon.h"
+#include "sd-messages.h"
 
-#include "journal-authenticate.h"
-#include "journald-server.h"
-#include "journald-kmsg.h"
-#include "journald-syslog.h"
-
-#include "sigbus.h"
 #include "formats-util.h"
+#include "journal-authenticate.h"
+#include "journald-kmsg.h"
+#include "journald-server.h"
+#include "journald-syslog.h"
+#include "sigbus.h"
 
 int main(int argc, char *argv[]) {
         Server server;

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

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;

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"
 

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;

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"
 

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"

src/journal/test-journal.c

@@ -22,11 +22,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "journal-authenticate.h"
+#include "journal-file.h"
+#include "journal-vacuum.h"
 #include "log.h"
 #include "rm-rf.h"
-#include "journal-file.h"
-#include "journal-authenticate.h"
-#include "journal-vacuum.h"
 
 static bool arg_keep = false;
 

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"

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"
 

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
 

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"

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;

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"

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"

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);

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'};
 

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"

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);

src/libsystemd/sd-bus/bus-bloom.h

@@ -22,6 +22,7 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 
 /*

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),

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"

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"