chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fixate show_status earlier, so that we actually print the welcome message
[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 763f3c3113be024ec72c0d18011b09ca4b320be3..0599980a6819c1d5fa8ba29d72e09414784d5d39 100644
(file)
--- a/
src/udev/udev-builtin-path_id.c
+++ b/
src/udev/udev-builtin-path_id.c
@@
-32,6
+32,7
@@
#include "udev.h"
#include "udev.h"
+_printf_(2,3)
static int path_prepend(char **path, const char *fmt, ...)
{
va_list va;
static int path_prepend(char **path, const char *fmt, ...)
{
va_list va;
@@
-70,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)