chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: use PRIu64i, PRIx64 macros
[elogind.git]
/
extras
/
volume_id
/
lib
/
ddf_raid.c
diff --git
a/extras/volume_id/lib/ddf_raid.c
b/extras/volume_id/lib/ddf_raid.c
index 53d309b8c0f63d76a679a8aaa05181d9489a8a41..58bdae94a734fd378319e9eedd7de35a15c43916 100644
(file)
--- a/
extras/volume_id/lib/ddf_raid.c
+++ b/
extras/volume_id/lib/ddf_raid.c
@@
-50,8
+50,7
@@
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
const uint8_t *buf;
struct ddf_header *ddf;
const uint8_t *buf;
struct ddf_header *ddf;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long)off, (unsigned long long)size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x30000)
return -1;
if (size < 0x30000)
return -1;
@@
-62,11
+61,11
@@
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
- info("header (little endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header (little endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
- info("header (big endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header (big endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
goto found;
}
@@
-77,11
+76,11
@@
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
- info("header adaptec (little endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header adaptec (little endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
- info("header adaptec (big endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header adaptec (big endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
goto found;
}