chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
detect-virt: Fix Xen domU discovery
[elogind.git]
/
src
/
udev
/
udev-builtin-blkid.c
diff --git
a/src/udev/udev-builtin-blkid.c
b/src/udev/udev-builtin-blkid.c
index 5b976abd8d70dbb2f607af0b394e22e43a301372..cf194c00c668bcb349d847056d11df31d2fb63f3 100644
(file)
--- a/
src/udev/udev-builtin-blkid.c
+++ b/
src/udev/udev-builtin-blkid.c
@@
-226,7
+226,6
@@
static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
const char *name;
int nvals;
int i;
const char *name;
int nvals;
int i;
- size_t len;
int err = 0;
bool is_gpt = false;
int err = 0;
bool is_gpt = false;
@@
-275,9
+274,9
@@
static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
if (err < 0)
goto out;
if (err < 0)
goto out;
- log_debug("probe %s %sraid offset=%
llu"
,
+ log_debug("probe %s %sraid offset=%
"PRIu64
,
udev_device_get_devnode(dev),
udev_device_get_devnode(dev),
- noraid ? "no" : "",
(unsigned long long)
offset);
+ noraid ? "no" : "", offset);
err = probe_superblocks(pr);
if (err < 0)
err = probe_superblocks(pr);
if (err < 0)
@@
-289,11
+288,10
@@
static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
nvals = blkid_probe_numof_values(pr);
for (i = 0; i < nvals; i++) {
nvals = blkid_probe_numof_values(pr);
for (i = 0; i < nvals; i++) {
- if (blkid_probe_get_value(pr, i, &name, &data,
&len
))
+ if (blkid_probe_get_value(pr, i, &name, &data,
NULL
))
continue;
continue;
- len = strnlen((char *) data, len);
- print_property(dev, test, name, (char *) data);
+ print_property(dev, test, name, data);
/* Is this a disk with GPT partition table? */
if (streq(name, "PTTYPE") && streq(data, "gpt"))
/* Is this a disk with GPT partition table? */
if (streq(name, "PTTYPE") && streq(data, "gpt"))