chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: manager - initialize variables
[elogind.git]
/
src
/
udev
/
udev-builtin-path_id.c
diff --git
a/src/udev/udev-builtin-path_id.c
b/src/udev/udev-builtin-path_id.c
index 74763301964d5bb3d2ab3c00cffd85cb9ed1b842..3ca59e011373a963d0282f01e32be33dfcc24a4c 100644
(file)
--- a/
src/udev/udev-builtin-path_id.c
+++ b/
src/udev/udev-builtin-path_id.c
@@
-71,9
+71,9
@@
static int format_lun_number(struct udev_device *dev, char **path)
/* address method 0, peripheral device addressing with bus id of zero */
if (lun < 256)
/* address method 0, peripheral device addressing with bus id of zero */
if (lun < 256)
- return path_prepend(path, "lun-%
d
", lun);
+ return path_prepend(path, "lun-%
lu
", lun);
/* handle all other lun addressing methods by using a variant of the original lun format */
/* handle all other lun addressing methods by using a variant of the original lun format */
- return path_prepend(path, "lun-0x%04
x%04x00000000", (lun & 0xffff)
, (lun >> 16) & 0xffff);
+ return path_prepend(path, "lun-0x%04
lx%04lx00000000", lun & 0xffff
, (lun >> 16) & 0xffff);
}
static struct udev_device *skip_subsystem(struct udev_device *dev, const char *subsys)
}
static struct udev_device *skip_subsystem(struct udev_device *dev, const char *subsys)
@@
-542,9
+542,6
@@
static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
} else if (streq(subsys, "xen")) {
path_prepend(&path, "xen-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "xen");
} else if (streq(subsys, "xen")) {
path_prepend(&path, "xen-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "xen");
- } else if (streq(subsys, "virtio")) {
- path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent));
- parent = skip_subsystem(parent, "virtio");
} else if (streq(subsys, "scm")) {
path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "scm");
} else if (streq(subsys, "scm")) {
path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "scm");