diff options
Diffstat (limited to 'src/grp-udev')
24 files changed, 49 insertions, 41 deletions
diff --git a/src/grp-udev/ata_id/ata_id.c b/src/grp-udev/ata_id/ata_id.c index 962332c0ad..22231225b6 100644 --- a/src/grp-udev/ata_id/ata_id.c +++ b/src/grp-udev/ata_id/ata_id.c @@ -37,11 +37,11 @@ #include <sys/types.h> #include <unistd.h> -#include "libudev.h" +#include <libudev.h> #include "basic/fd-util.h" -#include "libudev-private.h" #include "basic/log.h" +#include "libudev-private.h" #include "shared/udev-util.h" #define COMMAND_TIMEOUT_MSEC (30 * 1000) diff --git a/src/grp-udev/cdrom_id/cdrom_id.c b/src/grp-udev/cdrom_id/cdrom_id.c index 1e9c75acfd..90df241b45 100644 --- a/src/grp-udev/cdrom_id/cdrom_id.c +++ b/src/grp-udev/cdrom_id/cdrom_id.c @@ -34,10 +34,10 @@ #include <time.h> #include <unistd.h> -#include "libudev.h" +#include <libudev.h> -#include "libudev-private.h" #include "basic/random-util.h" +#include "libudev-private.h" /* device info */ static unsigned int cd_cd_rom; diff --git a/src/grp-udev/collect/collect.c b/src/grp-udev/collect/collect.c index 0ad6c4ca43..0e8f6b97fe 100644 --- a/src/grp-udev/collect/collect.c +++ b/src/grp-udev/collect/collect.c @@ -25,10 +25,10 @@ #include <stdio.h> #include "basic/alloc-util.h" -#include "libudev-private.h" #include "basic/macro.h" #include "basic/stdio-util.h" #include "basic/string-util.h" +#include "libudev-private.h" #define BUFSIZE 16 #define UDEV_ALARM_TIMEOUT 180 diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c index 09a3517444..759ecde5e4 100644 --- a/src/grp-udev/libudev-core/net/ethtool-util.c +++ b/src/grp-udev/libudev-core/net/ethtool-util.c @@ -17,17 +17,18 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <net/if.h> -#include <sys/ioctl.h> #include <linux/ethtool.h> #include <linux/sockios.h> +#include <net/if.h> +#include <sys/ioctl.h> -#include "shared/conf-parser.h" -#include "ethtool-util.h" #include "basic/log.h" #include "basic/string-table.h" #include "basic/strxcpyx.h" #include "basic/util.h" +#include "shared/conf-parser.h" + +#include "ethtool-util.h" static const char* const duplex_table[_DUP_MAX] = { [DUP_FULL] = "full", diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c index c2cd3dcc3c..f6803e00df 100644 --- a/src/grp-udev/libudev-core/net/link-config.c +++ b/src/grp-udev/libudev-core/net/link-config.c @@ -33,11 +33,11 @@ #include "basic/string-util.h" #include "basic/strv.h" #include "basic/util.h" +#include "libudev-private.h" #include "sd-netlink/netlink-util.h" #include "sd-netlink/sd-netlink.h" #include "shared/conf-parser.h" #include "systemd-network/network-internal.h" -#include "libudev-private.h" #include "ethtool-util.h" #include "link-config.h" diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h index b520e1ee9e..ad5211610a 100644 --- a/src/grp-udev/libudev-core/net/link-config.h +++ b/src/grp-udev/libudev-core/net/link-config.h @@ -19,11 +19,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "libudev.h" +#include <libudev.h> +#include "basic/list.h" #include "shared/condition.h" + #include "ethtool-util.h" -#include "basic/list.h" typedef struct link_config_ctx link_config_ctx; typedef struct link_config link_config; diff --git a/src/grp-udev/libudev-core/udev-builtin-blkid.c b/src/grp-udev/libudev-core/udev-builtin-blkid.c index b226626e8d..89fa75fa73 100644 --- a/src/grp-udev/libudev-core/udev-builtin-blkid.c +++ b/src/grp-udev/libudev-core/udev-builtin-blkid.c @@ -30,10 +30,10 @@ #include <systemd/sd-id128.h> #include "basic/alloc-util.h" -#include "shared/efivars.h" #include "basic/fd-util.h" -#include "shared/gpt.h" #include "basic/string-util.h" +#include "shared/efivars.h" +#include "shared/gpt.h" #include "udev.h" static void print_property(struct udev_device *dev, bool test, const char *name, const char *value) { diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c index a5290ebf2b..d2d95bf394 100644 --- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c +++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c @@ -22,13 +22,12 @@ #include <stdio.h> #include <stdlib.h> -#include "udev.h" - #include "basic/alloc-util.h" #include "basic/string-util.h" #include "sd-hwdb/hwdb-util.h" #include "sd-hwdb/sd-hwdb.h" #include "shared/udev-util.h" +#include "udev.h" static sd_hwdb *hwdb; diff --git a/src/grp-udev/libudev-core/udev-builtin-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c index ba2c819bfa..f5d700e299 100644 --- a/src/grp-udev/libudev-core/udev-builtin-input_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c @@ -22,19 +22,19 @@ */ #include <errno.h> +#include <linux/input.h> +#include <linux/limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <linux/limits.h> -#include <linux/input.h> #include "basic/fd-util.h" #include "basic/stdio-util.h" #include "basic/string-util.h" -#include "udev.h" #include "basic/util.h" +#include "udev.h" /* we must use this kernel-compatible implementation */ #define BITS_PER_LONG (sizeof(unsigned long) * 8) diff --git a/src/grp-udev/libudev-core/udev-builtin-keyboard.c b/src/grp-udev/libudev-core/udev-builtin-keyboard.c index f3ea583134..5067e2247a 100644 --- a/src/grp-udev/libudev-core/udev-builtin-keyboard.c +++ b/src/grp-udev/libudev-core/udev-builtin-keyboard.c @@ -17,11 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include <linux/input.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/ioctl.h> -#include <linux/input.h> #include "basic/fd-util.h" #include "basic/parse-util.h" diff --git a/src/grp-udev/libudev-core/udev-builtin-net_id.c b/src/grp-udev/libudev-core/udev-builtin-net_id.c index 3441f844be..f120f816e8 100644 --- a/src/grp-udev/libudev-core/udev-builtin-net_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_id.c @@ -89,6 +89,7 @@ #include <errno.h> #include <fcntl.h> +#include <linux/pci_regs.h> #include <net/if.h> #include <net/if_arp.h> #include <stdarg.h> @@ -96,7 +97,6 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <linux/pci_regs.h> #include "basic/fd-util.h" #include "basic/fileio.h" diff --git a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c index 4a32bac98a..3f3522f5e1 100644 --- a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c @@ -18,10 +18,11 @@ ***/ #include "basic/alloc-util.h" -#include "net/link-config.h" #include "basic/log.h" #include "udev.h" +#include "net/link-config.h" + static link_config_ctx *ctx = NULL; static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv, bool test) { diff --git a/src/grp-udev/libudev-core/udev-builtin-uaccess.c b/src/grp-udev/libudev-core/udev-builtin-uaccess.c index f15f07ad95..aab1c376de 100644 --- a/src/grp-udev/libudev-core/udev-builtin-uaccess.c +++ b/src/grp-udev/libudev-core/udev-builtin-uaccess.c @@ -25,9 +25,10 @@ #include <systemd/sd-login.h> #include "basic/login-util.h" -#include "logind-acl.h" -#include "udev.h" #include "basic/util.h" +#include "udev.h" + +#include "logind-acl.h" static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test) { int r; diff --git a/src/grp-udev/libudev-core/udev-event.c b/src/grp-udev/libudev-core/udev-event.c index 6825863c86..59f4e1fb35 100644 --- a/src/grp-udev/libudev-core/udev-event.c +++ b/src/grp-udev/libudev-core/udev-event.c @@ -33,10 +33,10 @@ #include "basic/alloc-util.h" #include "basic/fd-util.h" #include "basic/formats-util.h" -#include "sd-netlink/netlink-util.h" #include "basic/process-util.h" #include "basic/signal-util.h" #include "basic/string-util.h" +#include "sd-netlink/netlink-util.h" #include "udev.h" typedef struct Spawn { diff --git a/src/grp-udev/libudev-core/udev-rules.c b/src/grp-udev/libudev-core/udev-rules.c index 73fb7677da..134d269fd8 100644 --- a/src/grp-udev/libudev-core/udev-rules.c +++ b/src/grp-udev/libudev-core/udev-rules.c @@ -41,10 +41,10 @@ #include "basic/strbuf.h" #include "basic/string-util.h" #include "basic/strv.h" -#include "shared/sysctl-util.h" -#include "udev.h" #include "basic/user-util.h" #include "basic/util.h" +#include "shared/sysctl-util.h" +#include "udev.h" #define PREALLOC_TOKEN 2048 diff --git a/src/grp-udev/scsi_id/scsi_id.c b/src/grp-udev/scsi_id/scsi_id.c index 48c6cb4074..83011e918e 100644 --- a/src/grp-udev/scsi_id/scsi_id.c +++ b/src/grp-udev/scsi_id/scsi_id.c @@ -29,14 +29,15 @@ #include <sys/stat.h> #include <unistd.h> -#include "libudev.h" +#include <libudev.h> #include "basic/fd-util.h" -#include "libudev-private.h" -#include "scsi_id.h" #include "basic/string-util.h" +#include "libudev-private.h" #include "shared/udev-util.h" +#include "scsi_id.h" + static const struct option options[] = { { "device", required_argument, NULL, 'd' }, { "config", required_argument, NULL, 'f' }, diff --git a/src/grp-udev/scsi_id/scsi_serial.c b/src/grp-udev/scsi_id/scsi_serial.c index a7d76d0ab7..f926e17dad 100644 --- a/src/grp-udev/scsi_id/scsi_serial.c +++ b/src/grp-udev/scsi_id/scsi_serial.c @@ -33,13 +33,14 @@ #include <time.h> #include <unistd.h> -#include "libudev.h" +#include <libudev.h> -#include "libudev-private.h" #include "basic/random-util.h" +#include "basic/string-util.h" +#include "libudev-private.h" + #include "scsi.h" #include "scsi_id.h" -#include "basic/string-util.h" /* * A priority based list of id, naa, and binary/ascii for the identifier diff --git a/src/grp-udev/systemd-udevd/udevd.c b/src/grp-udev/systemd-udevd/udevd.c index 8033ab4eab..07edbb3450 100644 --- a/src/grp-udev/systemd-udevd/udevd.c +++ b/src/grp-udev/systemd-udevd/udevd.c @@ -46,7 +46,6 @@ #include "basic/alloc-util.h" #include "basic/cgroup-util.h" #include "basic/cpu-set-util.h" -#include "shared/dev-setup.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/formats-util.h" @@ -61,9 +60,10 @@ #include "basic/socket-util.h" #include "basic/string-util.h" #include "basic/terminal-util.h" +#include "basic/user-util.h" +#include "shared/dev-setup.h" #include "shared/udev-util.h" #include "udev.h" -#include "basic/user-util.h" static bool arg_debug = false; static int arg_daemonize = false; diff --git a/src/grp-udev/udevadm/udevadm-hwdb.c b/src/grp-udev/udevadm/udevadm-hwdb.c index 264e8027e2..3446de358c 100644 --- a/src/grp-udev/udevadm/udevadm-hwdb.c +++ b/src/grp-udev/udevadm/udevadm-hwdb.c @@ -26,12 +26,12 @@ #include "basic/conf-files.h" #include "basic/fileio.h" #include "basic/fs-util.h" -#include "sd-hwdb/hwdb-internal.h" -#include "sd-hwdb/hwdb-util.h" #include "basic/strbuf.h" #include "basic/string-util.h" -#include "udev.h" #include "basic/util.h" +#include "sd-hwdb/hwdb-internal.h" +#include "sd-hwdb/hwdb-util.h" +#include "udev.h" /* * Generic udev properties, key/value database based on modalias strings. diff --git a/src/grp-udev/udevadm/udevadm-info.c b/src/grp-udev/udevadm/udevadm-info.c index 9694a991ec..f8b2d915a4 100644 --- a/src/grp-udev/udevadm/udevadm-info.c +++ b/src/grp-udev/udevadm/udevadm-info.c @@ -30,6 +30,7 @@ #include "basic/string-util.h" #include "shared/udev-util.h" #include "udev.h" + #include "udevadm-util.h" static bool skip_attribute(const char *name) { diff --git a/src/grp-udev/udevadm/udevadm-settle.c b/src/grp-udev/udevadm/udevadm-settle.c index 8b32e58a0c..2a7a150517 100644 --- a/src/grp-udev/udevadm/udevadm-settle.c +++ b/src/grp-udev/udevadm/udevadm-settle.c @@ -27,8 +27,8 @@ #include <unistd.h> #include "basic/parse-util.h" -#include "udev.h" #include "basic/util.h" +#include "udev.h" static void help(void) { printf("%s settle OPTIONS\n\n" diff --git a/src/grp-udev/udevadm/udevadm-trigger.c b/src/grp-udev/udevadm/udevadm-trigger.c index 89ca90d01b..280f348fae 100644 --- a/src/grp-udev/udevadm/udevadm-trigger.c +++ b/src/grp-udev/udevadm/udevadm-trigger.c @@ -24,10 +24,11 @@ #include <unistd.h> #include "basic/string-util.h" +#include "basic/util.h" #include "shared/udev-util.h" #include "udev.h" + #include "udevadm-util.h" -#include "basic/util.h" static int verbose; static int dry_run; diff --git a/src/grp-udev/udevadm/udevadm-util.c b/src/grp-udev/udevadm/udevadm-util.c index 4ae5e6c7ef..8dc871cb10 100644 --- a/src/grp-udev/udevadm/udevadm-util.c +++ b/src/grp-udev/udevadm/udevadm-util.c @@ -16,6 +16,7 @@ */ #include "basic/string-util.h" + #include "udevadm-util.h" struct udev_device *find_device(struct udev *udev, diff --git a/src/grp-udev/v4l_id/v4l_id.c b/src/grp-udev/v4l_id/v4l_id.c index 4779cf34f3..3271121a3b 100644 --- a/src/grp-udev/v4l_id/v4l_id.c +++ b/src/grp-udev/v4l_id/v4l_id.c @@ -17,6 +17,7 @@ #include <errno.h> #include <fcntl.h> #include <getopt.h> +#include <linux/videodev2.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -24,7 +25,6 @@ #include <sys/time.h> #include <sys/types.h> #include <unistd.h> -#include <linux/videodev2.h> #include "basic/fd-util.h" #include "basic/util.h" |