tree-wide: group include of libudev.h with sd-*

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index a2da976bb61fbba84883cd37385424f35ebe4344..b0fa079fec2b560b0979d43704a1c4e8de1ce39b 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -19,11 +19,12 @@
   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/core/device.c b/src/core/device.c
index 5b7130ba97d8b59c62286af749f5ab5f7fc83e04..bcd4d1146bec44bb9a44c9ebf4ad75c26e0dba63 100644 (file)
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -22,10 +22,11 @@
 #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/swap.c b/src/core/swap.c
index f9e1ebad49c8ed1bd9609adf50d1fae96f838c4e..ee0838e6762faf7a3435c3b5b9824b9cf90d9409 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -24,6 +24,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#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 954e50528d31c6cd8b4bd859c9d8ec5b2f9f4f1c..9d1f7660db7bc11569cb87b2b9886775a305f4fd 100644 (file)
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -27,11 +27,12 @@
 #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/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index c32bf1c9d64b0fe7587bd178ef0a71a90a155013..ce8cecc5cbbfdceb7fe0eece71aff2c4a2240aee 100644 (file)
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -24,6 +24,7 @@
 #include <sys/statfs.h>
 #include <unistd.h>
 
+#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 9a8d1e026ba14a594cc5145af45c94bbbb24bd2a..e048e04716b4cbda59722f4bd4afd00fa38f79de 100644 (file)
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -25,6 +25,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#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 b532616db6f6f738e32fd2637d9139872fb71e45..be913d26ef465af049f8ad2ca8971ce80fc61a23 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -28,6 +28,7 @@
 #include <sys/statvfs.h>
 #include <linux/sockios.h>
 
+#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 d40c8a7f9cbeeb6aba1c9caf8d9d816f3e69e36e..d7ae8655573f7124d179b7457945a5412c279fb4 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/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index fa4e3a2b1e79a3a0fbeb3b9fabe9b82c727ba621..2d3e62410c5724a3e2684bf890912c577dbfcbf7 100644 (file)
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -18,10 +18,11 @@
   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 b17ecd870d655cd353e29fb2945d0ca9d4552024..814e016800cff82f7a373fe2c5f826b55be6b2b5 100644 (file)
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#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 f15b099ad1c5b2852335de1dffd6fd2e35b17bed..442f9615f2d4310a4eabc5b612d9926e256ebad3 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 f1ef4ac96fb06eecc2b3e50d48e26110a2601e87..f870eba9eb2715a24d0e47986d7d095cc8f3d873 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -28,12 +28,13 @@
 #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-util.c b/src/libudev/libudev-util.c
index 4a75980b1fd5d8080aa2d7be3d5212c1110b31e9..574cfeac85684dd9bdafb12f6fd8b861b81434b6 100644 (file)
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -24,10 +24,11 @@
 #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 3f76dd817136f47317e312aba0b501eea6120697..63fb05547dee4e1c59ce30749ea7574968fb2fd8 100644 (file)
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -24,10 +24,11 @@
 #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-session-device.c b/src/login/logind-session-device.c
index 0c6983d73ae15de15d671d694171a94cb237e579..9bf3ca0995530eca91c25aedcf911416f31fe8a1 100644 (file)
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -25,10 +25,11 @@
 #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.c b/src/login/logind.c
index 04f467ceb4d1b006130f8bd3482beb387fd1c1d3..7b41174c64b2f84b723bfae6312b4f3a4314028c 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#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 86acee5751dfaf8c115f9268b5adc8fee8257cab..e9ca4bb03d0d15cdb0c02a14eeeffedd6d1087af 100644 (file)
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -22,8 +22,9 @@
 #include <errno.h>
 #include <string.h>
 
-#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 86ab2f73baa2699a0693f83dc75a39e244c578b7..8f74c41c71a4fd8c93fbe0b8dc7942d233b8d662 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -22,12 +22,12 @@
 #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"

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 45a41ccd336e2706612d434f04ae77230c338a04..5c45a3ae6c519d17f2edb290c0e2faaea6ce16c3 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -22,6 +22,7 @@
 #include <linux/rfkill.h>
 #include <poll.h>
 
+#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 422926ef456fb9b134b24a59a0b5967bbb34a90f..350eaf734dd1d040829707aea5aafd06e0c452c6 100644 (file)
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #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 be3471013d43debe25d28bc8800744635fe0be3d..1e414664ce74bc12551fef57ad4711d789be522a 100644 (file)
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -37,9 +37,10 @@
 #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 3ca576d75b841bcb5db3966c4bc32b230df25791..72f284f71082cf51da598a0da1db88f8c53ed412 100644 (file)
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -34,8 +34,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#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 ff16344316c3ff54056df7e0a71f4f4d64730517..46556916429b6352424b34e7e880332003e0ae56 100644 (file)
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -29,9 +29,10 @@
 #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 71a518a4537a882e08cb97aa987ce215af9d535f..c7ef783684b88ac8d744dde0bfd89e907df018c6 100644 (file)
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -33,8 +33,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "libudev-private.h"
 #include "libudev.h"
+
+#include "libudev-private.h"
 #include "random-util.h"
 #include "scsi.h"
 #include "scsi_id.h"