From b4bbcaa9c44260e88402cb8f9a5fb8ac7f35e123 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Tue, 17 Nov 2015 06:52:45 +0100 Subject: [PATCH] tree-wide: group include of libudev.h with sd-* --- src/backlight/backlight.c | 3 ++- src/core/device.c | 3 ++- src/core/swap.c | 3 ++- src/core/umount.c | 3 ++- src/gpt-auto-generator/gpt-auto-generator.c | 2 +- src/journal/journald-kmsg.c | 2 +- src/journal/journald-server.c | 2 +- src/libsystemd-network/dhcp-identifier.c | 2 +- src/libudev/libudev-device-private.c | 3 ++- src/libudev/libudev-device.c | 2 +- src/libudev/libudev-enumerate.c | 2 +- src/libudev/libudev-monitor.c | 3 ++- src/libudev/libudev-util.c | 3 ++- src/libudev/libudev.c | 3 ++- src/login/logind-session-device.c | 3 ++- src/login/logind.c | 2 +- src/login/sysfs-show.c | 3 ++- src/nspawn/nspawn-network.c | 2 +- src/rfkill/rfkill.c | 2 +- src/test/test-libudev.c | 1 + src/udev/ata_id/ata_id.c | 3 ++- src/udev/cdrom_id/cdrom_id.c | 3 ++- src/udev/scsi_id/scsi_id.c | 3 ++- src/udev/scsi_id/scsi_serial.c | 3 ++- 24 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c index a2da976bb6..b0fa079fec 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -19,11 +19,12 @@ along with systemd; If not, see . ***/ +#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/core/device.c b/src/core/device.c index 5b7130ba97..bcd4d1146b 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -22,10 +22,11 @@ #include #include +#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/swap.c b/src/core/swap.c index f9e1ebad49..ee0838e676 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -24,6 +24,8 @@ #include #include +#include "libudev.h" + #include "alloc-util.h" #include "dbus-swap.h" #include "escape.h" @@ -31,7 +33,6 @@ #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/umount.c b/src/core/umount.c index 954e50528d..9d1f7660db 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -27,11 +27,12 @@ #include #include +#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/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index c32bf1c9d6..ce8cecc5cb 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -24,6 +24,7 @@ #include #include +#include "libudev.h" #include "sd-id128.h" #include "alloc-util.h" @@ -36,7 +37,6 @@ #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/journal/journald-kmsg.c b/src/journal/journald-kmsg.c index 9a8d1e026b..e048e04716 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c @@ -25,6 +25,7 @@ #include #include +#include "libudev.h" #include "sd-messages.h" #include "escape.h" @@ -34,7 +35,6 @@ #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-server.c b/src/journal/journald-server.c index b532616db6..be913d26ef 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -28,6 +28,7 @@ #include #include +#include "libudev.h" #include "sd-daemon.h" #include "sd-journal.h" #include "sd-messages.h" @@ -57,7 +58,6 @@ #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/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index d40c8a7f9c..d7ae865557 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ +#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/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c index fa4e3a2b1e..2d3e62410c 100644 --- a/src/libudev/libudev-device-private.c +++ b/src/libudev/libudev-device-private.c @@ -18,10 +18,11 @@ along with systemd; If not, see . ***/ +#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 b17ecd870d..814e016800 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -34,6 +34,7 @@ #include #include +#include "libudev.h" #include "sd-device.h" #include "alloc-util.h" @@ -41,7 +42,6 @@ #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 f15b099ad1..442f9615f2 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/libudev-enumerate.c @@ -28,13 +28,13 @@ #include #include +#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 f1ef4ac96f..f870eba9eb 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -28,12 +28,13 @@ #include #include +#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-util.c b/src/libudev/libudev-util.c index 4a75980b1f..574cfeac85 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-util.c @@ -24,10 +24,11 @@ #include #include +#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 3f76dd8171..63fb05547d 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -24,10 +24,11 @@ #include #include +#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-session-device.c b/src/login/logind-session-device.c index 0c6983d73a..9bf3ca0995 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -25,10 +25,11 @@ #include #include +#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.c b/src/login/logind.c index 04f467ceb4..7b41174c64 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -24,6 +24,7 @@ #include #include +#include "libudev.h" #include "sd-daemon.h" #include "alloc-util.h" @@ -34,7 +35,6 @@ #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 86acee5751..e9ca4bb03d 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -22,8 +22,9 @@ #include #include -#include "alloc-util.h" #include "libudev.h" + +#include "alloc-util.h" #include "locale-util.h" #include "path-util.h" #include "string-util.h" diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index 86ab2f73ba..8f74c41c71 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -22,12 +22,12 @@ #include #include +#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" diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index 45a41ccd33..5c45a3ae6c 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -22,6 +22,7 @@ #include #include +#include "libudev.h" #include "sd-daemon.h" #include "alloc-util.h" @@ -29,7 +30,6 @@ #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/test/test-libudev.c b/src/test/test-libudev.c index 422926ef45..350eaf734d 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -24,6 +24,7 @@ #include #include "libudev.h" + #include "string-util.h" #include "udev-util.h" #include "util.h" diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index be3471013d..1e414664ce 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -37,9 +37,10 @@ #include #include +#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 3ca576d75b..72f284f710 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -34,8 +34,9 @@ #include #include -#include "libudev-private.h" #include "libudev.h" + +#include "libudev-private.h" #include "random-util.h" /* device info */ diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index ff16344316..4655691642 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -29,9 +29,10 @@ #include #include +#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 71a518a453..c7ef783684 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -33,8 +33,9 @@ #include #include -#include "libudev-private.h" #include "libudev.h" + +#include "libudev-private.h" #include "random-util.h" #include "scsi.h" #include "scsi_id.h"